Fin generation du catalogue

diff --git a/bin/AdaoCalatogGenerator.py b/bin/AdaoCalatogGenerator.py
index c9df254c990b89ca26a905caa0b5e6550985e65c..ffebe2e436108aa38033e74a3bc1df5548b9ed90 100644 (file)
--- 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 fd2c5672b8aafe65b6e818f867282392f21027ef..1069da6cf6f504a93ab50702981feb538f0f540c 100644 (file)
--- 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 ba14af54577468ceeb3532fe813746e14f0a4208..f68a6d4a6d42c80c1eff69935d158ff1bf2dd80f 100644 (file)
--- 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