ajout annotation

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index 1176a5de5ccd2db55d3eefcc5418bd05eb525a65..4575f07234194e116593c5b5654daca11dc51cc6 100755 (executable)
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -1006,7 +1006,6 @@ class X_JDC_CATA :
         #   self.texteXSD += texteKeyRef
         #   self.texteXSD += fermeEltCata 
 
-        self.texteXSD += texteFin
 
 
 
@@ -1014,18 +1013,19 @@ class X_JDC_CATA :
         dico = {}
         for  k in list(cata.dictTypesXSD.keys()):
              if len(cata.dictTypesXSD[k]) > 1:
-                index=0
+                print (cata.dictTypesXSD[k])
                 dico[k]={}
                 for definition in cata.dictTypesXSD[k] : 
                     nom=definition.nomComplet()
-                    if index == 0 : dico[k][nom]=k+str(index)
-                    else :          dico[k][nom]=k+str(index)
-                    index=index+1
+                    dico[k][nom]=definition.nomDuTypePyxb
+        if dico != {} : self.texteXSD += texteAnnotation.format(str(dico))
   
+        print (dico)
         #import pprint
         #if (not PourTraduction) and  (dico != {}) : pprint.pprint(dico)
         print ('__________________________ decommenter pour le texteXSD________________________')
         #print (self.texteXSD)
+        self.texteXSD += texteFin
         return self.texteXSD