String et Script pour les observers

[modules/adao.git] / bin / AdaoCatalogGenerator.py

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index a0605e6744772f85a6c6d27265b29158779ff0dc..941d1dd3c32f409f5865cef678adc97ec541429b 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -95,11 +95,12 @@ observers_choice = """
                                        ${var_name} = BLOC (condition=" '${var_name}' in set(SELECTION) ",
                                                   ${var_name}_data = FACT(statut = "o",
                                                              Scheduler = SIMP(statut = "f", typ = "TXM"),
-                                                             NodeType  = SIMP(statut = "o", typ = "TXM", min=1, max=1, defaut = "", into=("pyscript", "userfile")),
-                                                             PythonScript = BLOC (condition = " NodeType == 'pyscript' ",
+                                                             Info      = SIMP(statut = "f", typ = "TXM"),
+                                                             NodeType  = SIMP(statut = "o", typ = "TXM", min=1, max=1, defaut = "", into=("String", "Script")),
+                                                             PythonScript = BLOC (condition = " NodeType == 'String' ",
                                                                                   Value = SIMP(statut = "o", typ = "TXM")
                                                                                  ),
-                                                             UserFile = BLOC (condition = " NodeType == 'userfile' ",
+                                                             UserFile = BLOC (condition = " NodeType == 'Script' ",
                                                                               Value = SIMP(statut = "o", typ = "FichierNoAbs", validators=(OnlyStr()))
                                                                              )
                                                                       ),
@@ -108,7 +109,7 @@ observers_choice = """
 
 observers_method = """
 def F_Observers(statut) : return FACT(statut=statut,
-                                      SELECTION = SIMP(statut="o", defaut=[], typ="TXM", max="**", validators=NoRepeat(), into=(${choices})),
+                                      SELECTION = SIMP(statut="o", defaut=[], typ="TXM", min=0, max="**", validators=NoRepeat(), into=(${choices})),
 ${decl_choices}
                                      )
 """