From 91c80ddec59f8d81d0fd82691c901de3f507b8b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Ribes?= <andre.ribes@edf.fr>
Date: Tue, 13 Jul 2010 17:17:45 +0200
Subject: [PATCH] Fin generation du catalogue

---
 bin/AdaoCalatogGenerator.py | 18 +++++++++---------
 bin/Makefile.am             |  4 ++--
 src/daEficas/Makefile.am    |  3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bin/AdaoCalatogGenerator.py b/bin/AdaoCalatogGenerator.py
index c9df254..ffebe2e 100644
--- a/bin/AdaoCalatogGenerator.py
+++ b/bin/AdaoCalatogGenerator.py
@@ -53,30 +53,30 @@ String_data_bloc = """
 """
 
 Script_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
+                                     SCRIPT_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
-                                                  FILE = SIMP(statut = "o", typ = "Fichier"),
+                                                  SCRIPT_FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
 Dict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
+                                     DICT_DATA = BLOC ( condition = " FROM in ( 'Script', ) ",
 
-                                                  FILE = SIMP(statut = "o", typ = "Fichier"),
+                                                  SCRIPT_FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
 # Pour l'instant on ne gère qu'un seul script pour toutes les functions
 FunctionDict_data_bloc = """
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'FunctionDict', ) ",
+                                     FUNCTIONDICT_DATA = BLOC ( condition = " FROM in ( 'FunctionDict', ) ",
 
-                                                  FILE = SIMP(statut = "o", typ = "Fichier"),
+                                                  FUNCTIONDICT_FILE = SIMP(statut = "o", typ = "Fichier"),
                                                  ),
 """
 
 data_method = """
 def F_${data_name}(statut) : return FACT(statut = statut,
-                                         FILE = SIMP(statut = "o", typ = "TXM", into=(${data_into})),
+                                         FROM = SIMP(statut = "o", typ = "TXM", into=(${data_into})),
 ${data_bloc}
                                     )
 """
@@ -91,8 +91,8 @@ def F_InitChoice() : return  ("Background",
                               "Analysis",
                              )
 def F_Init(statut) : return FACT(statut = statut,
-                                 FILE = SIMP(statut = "o", typ = "Fichier"),
-                                 TARGET_LIST = SIMP(statut = "o", typ = "TXM", min=1, max="**", into=F_InitChoice()),
+                                 INIT_FILE = SIMP(statut = "o", typ = "Fichier"),
+                                 TARGET_LIST = SIMP(statut = "o", typ = "TXM", min=1, max="**", into=F_InitChoice(),  validators=VerifExiste(2)),
                                 )
 """
 assim_data_method = """
diff --git a/bin/Makefile.am b/bin/Makefile.am
index fd2c567..1069da6 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -5,7 +5,7 @@ bin_SCRIPTS = AdaoYacsSchemaCreator.py qtEficas_adao_study.py AdaoCalatogGenerat
 EXTRA_DIST = AdaoYacsSchemaCreator.py qtEficas_adao_study.py.in AdaoCalatogGenerator.py
 
 install-data-hook:
-	@export PYTHONPATH=${salomepythondir} && python $(top_srcdir)/bin/AdaoCalatogGenerator.py ${salomepythondir}/daEficas CatalogTest.py
+	@export PYTHONPATH=${salomepythondir} && python $(top_srcdir)/bin/AdaoCalatogGenerator.py ${salomepythondir}/daEficas ADAO_Cata_V0.py
 
 uninstall-hook:
-	@rm  ${salomepythondir}/daEficas/CatalogTest.py
+	@rm  ${salomepythondir}/daEficas/ADAO_Cata_V0.py
diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am
index ba14af5..f68a6d4 100644
--- a/src/daEficas/Makefile.am
+++ b/src/daEficas/Makefile.am
@@ -24,10 +24,9 @@ mypkgpythondir =$(salomepythondir)/daEficas
 mypkgpython_PYTHON = \
 		     configuration_ADAO.py \
 		     convert_adao.py \
-		     ADAO_Cata_V0.py \
 		     generator_adao.py \
 		     __init__.py \
 		     prefs_ADAO.py \
 		     prefs.py
 
-EXTRA_DIST = prefs_ADAO.py.in
+EXTRA_DIST = prefs_ADAO.py.in ADAO_Cata_V0.py
-- 
2.39.2