Ajout de l'option pour le noeud YACS

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index d02d726aa74448636bf821bea5bd1766bebaecd1..3d8517027aeb2c1094fa926e1e3292dba41f002c 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -93,7 +93,14 @@ assim_data_choice = """
 
 observers_choice = """
                                        ${var_name} = BLOC (condition=" '${var_name}' in set(SELECTION) ",
-                                                           Scheduler = SIMP(statut = "f", typ = "TXM")
+                                                           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()))
+                                                                           )
                                                           ),
 """