suffixe du dico par le nom du code

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index 8e28d7d49d4ad82852cd7d007a80aae5d067a20b..9c3a91b6f905d9ded7c7a3626ded92a07bf3cadb 100755 (executable)
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -1102,7 +1102,7 @@ class X_JDC_CATA :
              if dico[k]== {} : del dico[k]
         import pprint
         #pprint.pprint(dico)
-        if dico != {} : self.texteXSD += texteAnnotation.format(str(dico))
+        if dico != {} : self.texteXSD += texteAnnotation.format(self.nomDuCodeDumpe,str(dico))
   
         #import pprint
         #if (not PourTraduction) and  (dico != {}) : pprint.pprint(dico)

diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index d6bd7096f6782f8c6653d71e979df912dc0cc379..f745302abebf6ec57b252f9cbd689f031dbbf9e6 100644 (file)
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -3,7 +3,7 @@ texteDebutNiveau2='<?xml version="1.0" encoding="UTF-8"?>\n<xs:schema xmlns:xs="
 texteDebutNiveau3='<?xml version="1.0" encoding="UTF-8"?>\n<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"\nxmlns="http://chercheurs.edf.com/logiciels/{}"\nxmlns:{}="http://chercheurs.edf.com/logiciels/{}"\nxmlns:{}="http://chercheurs.edf.com/logiciels/{}"\nxmlns:{}="http://chercheurs.edf.com/logiciels/{}"\ntargetNamespace="http://chercheurs.edf.com/logiciels/{}"\nelementFormDefault="qualified" attributeFormDefault="unqualified" version="0">\n'
 texteFin='</xs:schema>'
 
-texteAnnotation= '\t<xs:simpleType name="PNEFdico">\n\t\t<xs:annotation>\n\t\t<xs:documentation>{}\n\t\t</xs:documentation>\n\t\t</xs:annotation>\n\t<xs:restriction base="xs:string"></xs:restriction>\n\t</xs:simpleType>\n'
+texteAnnotation= '\t<xs:simpleType name="PNEFdico_{}">\n\t\t<xs:annotation>\n\t\t<xs:documentation>{}\n\t\t</xs:documentation>\n\t\t</xs:annotation>\n\t<xs:restriction base="xs:string"></xs:restriction>\n\t</xs:simpleType>\n'
 
 # SIMP
 debutSimpleType      = '\t<xs:simpleType name="{}">\n'

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 2a705dd2d00a87eb39919fa1ac35719cb2b0db5f..e229b5fa56d8539f6205aafe4aadf5d26e418e17 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -226,7 +226,7 @@ class ReaderCata (ReaderCataCommun):
              self.QWParent.informe('environnement', 'please source pyxb environment')
              exit()
            try : 
-           if 1 :
+           #if 1 :
              nomCataXsd = os.path.splitext(os.path.basename(self.fichierCata))[0]
              fichierCataTrunc=os.path.splitext(os.path.basename(self.fichierCata))[0]  
              nomCataXsd = fichierCataTrunc+'_driver' 
@@ -235,7 +235,8 @@ class ReaderCata (ReaderCataCommun):
              modeleMetier= imp.load_source(nomCataXsd,pathCata)
              #print ('nomCataXsd , pathCata ',nomCataXsd,pathCata)
              try : 
-               texte=modeleMetier.PNEFdico.__doc__
+               monObjetAnnotation = getattr(modeleMetier,'PNEFdico_'+self.code)
+               texte=monObjetAnnotation.__doc__
              except : 
                texte=None
              if texte != None and texte != "":