String et Script pour les observers

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

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index 3d8517027aeb2c1094fa926e1e3292dba41f002c..941d1dd3c32f409f5865cef678adc97ec541429b 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -93,20 +93,23 @@ assim_data_choice = """
 
 observers_choice = """
                                        ${var_name} = BLOC (condition=" '${var_name}' in set(SELECTION) ",
-                                                           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' ",
-                                                                                Value = SIMP(statut = "o", typ = "TXM")
-                                                                               ),
-                                                           UserFile = BLOC (condition = " NodeType == 'userfile' ",
-                                                                            Value = SIMP(statut = "o", typ = "FichierNoAbs", validators=(OnlyStr()))
-                                                                           )
+                                                  ${var_name}_data = FACT(statut = "o",
+                                                             Scheduler = SIMP(statut = "f", typ = "TXM"),
+                                                             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 == 'Script' ",
+                                                                              Value = SIMP(statut = "o", typ = "FichierNoAbs", validators=(OnlyStr()))
+                                                                             )
+                                                                      ),
                                                           ),
 """
 
 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}
                                      )
 """