chgt dump des Assd

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index eeb242aac70268926ccf51accd28c424a4b98cd1..34a0238373297549ef85582450ad0d45f3ef5e5f 100755 (executable)
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -991,18 +991,28 @@ class X_SIMP (X_definition):
 
         self.texteSimplePart1=""
         if not(isinstance(typeATraduire,str)) and not(isinstance(typeATraduire,Accas.Tuple)) and issubclass(typeATraduire, Accas.UserASSD) :
-            self.isAtypeUserASSD = True
             cata = CONTEXT.getCurrentCata()
             if len(self.type) == 2 and self.type[1]=='createObject' : suffixe = 'C'
-            else : suffixe = 'U'
+            else : suffixe = 'U' 
+            print (cata.listeUserASSDDumpes)
+            print (typeATraduire.__name__)
+            print (typeATraduire.__name__ in cata.listeUserASSDDumpes)
+            if typeATraduire.__name__  not in cata.listeUserASSDDumpes :
+                cata.listeUserASSDDumpes.add(typeATraduire.__name__)
+                if issubclass(typeATraduire, Accas.UserASSDMultiple) : 
+                   self.texteSimplePart1 = defUserASSDMultiple.format(typeATraduire.__name__)
+                   if cata.definitUserASSDMultiple == False  :
+                      cata.definitUserASSDMultiple = True
+                      cata.texteSimple = cata.texteSimple + defBaseXSDUserASSDMultiple
+                else :
+                   self.texteSimplePart1 = defUserASSD.format(typeATraduire.__name__)
+                   if cata.definitUserASSD == False  :
+                      cata.definitUserASSD = True
+                      cata.texteSimple = cata.texteSimple + defBaseXSDUserASSD
             if typeATraduire.__name__+'_'+suffixe not in cata.listeUserASSDDumpes :
-                self.texteSimplePart1 = defUserAssd.format(typeATraduire.__name__, suffixe)
+                cata.texteSimple = cata.texteSimple + defUserASSDOrUserASSDMultiple.format(typeATraduire.__name__, suffixe,typeATraduire.__name__)
                 cata.listeUserASSDDumpes.add(typeATraduire.__name__+'_'+suffixe)
 
-            if cata.definitUserASSD ==False  :
-                cata.definitUserASSD = True
-                cata.texteSimple = cata.texteSimple + defBaseXSDUserAssd
-
 
         if not multiple : self.texteSimple  += debutSimpleType.format(self.nomDuTypePyxb)
         else : self.texteSimple  += debutSimpleTypeSsNom
@@ -1238,6 +1248,7 @@ class X_JDC_CATA :
             else : self.texteCata += eltCataFils.format(self.implement,self.nomDuXsdPere,self.nomDuXsdPere,self.nomDuXsdPere)
             self.texteInclusion += includeCata.format(self.nomDuXsdPere)
 
+    
         self.texteCata += eltCata.format(self.implement,self.implement,self.implement,self.implement,self.nomDuXsdPere)
         #if self.implement == self.code :
         #   self.texteCata      += debutTypeCata.format(self.nomDuCodeDumpe)