pb des noms en double et du nom de code mal defini

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index c030fb0f12d156671316841daec353dbf52d8136..1af0889be3832c3509434855091093b83361089c 100755 (executable)
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -1263,7 +1263,9 @@ class X_JDC_CATA :
             if dico[k]== {} or (not different) : del dico[k]
         import pprint
         #pprint.pprint(dico)
-        if dico != {} : self.texteXSD += texteAnnotation.format(self.nomDuCodeDumpe,str(dico))
+        # PN reflechir a ce *** de nom
+        #if dico != {} : self.texteXSD += texteAnnotation.format(self.nomDuCodeDumpe,str(dico))
+        if dico != {} : self.texteXSD += texteAnnotation.format(str(dico))
 
         #import pprint
         #if (not PourTraduction) and  (dico != {}) : pprint.pprint(dico)

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 5848d20a475487bcede0439eff5e5364f4d247e1..e2550adb7072d3570601801be23285a4fa643f1e 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -237,7 +237,9 @@ class ReaderCata (ReaderCataCommun):
                     modeleMetier= imp.load_source(nomCataXsd,pathCata)
                     #print ('nomCataXsd , pathCata ',nomCataXsd,pathCata)
                     try :
-                        monObjetAnnotation = getattr(modeleMetier,'PNEFdico_'+self.code)
+                    #if 1 :
+                        #monObjetAnnotation = getattr(modeleMetier,'PNEFdico_'+self.code)
+                        monObjetAnnotation = getattr(modeleMetier,'PNEFdico')
                         texte=monObjetAnnotation.__doc__
                     except :
                         texte=None