au milieu du gué pour chgt de machine PN

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index d356ae024355bc45a1fda1273d21b63d5e8be7a5..371b10a4faf96b65f6b701cc51e4ba810f7acc1a 100755 (executable)
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -830,18 +830,27 @@ class X_SIMP (X_definition):
         if not multiple :
             #print ('je passe la pas multiple')
             if self.defaut :
-                if self.max > 1 or self.max == '**' or self.max ==  float('inf') :
+               if self.max > 1 or self.max == '**' or self.max ==  float('inf') :
                     # a revoir pour les tuples avec defaut
                     txtDefaut=""
-                    for val in self.defaut : txtDefaut+=str(val) +" "
+                    for val in self.defaut : 
+                        #val2=val.replace(' ','\\u0020')
+                        txtDefaut+=str(val) + " "
+                    txtDefaut+=txtDefaut[0:-1]
                     self.texteElt = eltWithDefautDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut)
-                else :
+               else :
                     if str(self.defaut)   == 'True'  : txtDefaut = 'true'
                     elif str(self.defaut) == 'False' : txtDefaut = 'false'
                     else : txtDefaut = str(self.defaut)
-                    self.texteElt = eltWithDefautDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut)
-            else : self.texteElt = eltDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1)
+                    if self.ang != ''  : self.texteElt = eltWithDefautAndHelpDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut,self.ang)
+                    elif self.fr != '' : self.texteElt = eltWithDefautAndHelpDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut,self.fr)
+                    else : self.texteElt = eltWithDefautDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,txtDefaut)
+            else :
+               if self.ang  != '' : self.texteElt = eltWithHelpDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,self.ang)
+               elif self.fr != '' : self.texteElt = eltWithHelpDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,self.fr)
+               else : self.texteElt = eltDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,minOccurs,1,self.ang)
         elif first:
+            # PNPN --> Que faire de l'aide ?
             self.texteElt = eltDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,1,1)
 
         # self.aCreer est mis a jour ds definitNomDuTypePyxb

diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index 12387b09a669de12235e1b1a7638e804d683f8cc..3b3aeaea66250a122c40bbe7746eb0a522ef849f 100644 (file)
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -22,6 +22,8 @@ fermeBalisesMileu   = '\t\t\t\t\t\t</xs:restriction>\n\t\t\t\t\t</xs:simpleType>
 maxLengthTypeSimple = '\t\t\t<xs:maxLength value = "{}"/>\n'
 minLengthTypeSimple = '\t\t\t<xs:minLength value = "{}"/>\n'
 eltDsSequence       = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}"/>\n'
+eltWithHelpDsSequence      = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}">\n\t\t\t\t<xs:annotation>\n\t\t\t\t\t<xs:documentation>{}</xs:documentation>\n\t\t\t\t</xs:annotation>\n\t\t\t</xs:element>\n'
+eltWithDefautAndHelpDsSequence    = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}" default="{}">\n\t\t\t\t<xs:annotation>\n\t\t\t\t\t<xs:documentation>{}</xs:documentation>\n\t\t\t\t</xs:annotation>\n\t\t\t</xs:element>\n'
 eltWithDefautDsSequence    = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}" default="{}"/>\n'
 UsingASSDkeyRefDeclaration = '\n\t<xs:keyref name="{}_Name_ref_a{}" refer="{}:Key_Name_For_{}"> \n\t\t<xs:selector xpath="{}"/>\n\t\t<xs:field xpath="."/>\n\t</xs:keyref>\n'
 #    <xs:key name="Key_Name_For_ElementarySurface">
@@ -43,6 +45,8 @@ debutTypeCompoSeq   = '\t\t<xs:sequence>\n'
 finTypeCompoSeq     = '\t\t</xs:sequence>\n'
 finTypeCompo        = '\t</xs:complexType>\n'
 eltCompoDsSequence  = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}"/>\n'
+eltCompoWithHelpDsSequence = '\t\t\t<xs:element name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}"/>\n' 
+#name="{}" type="{}:{}" minOccurs="{}" maxOccurs="{}">\n\t\t\t\t<xs:annotation>\n\t\t\t\t\t<xs:documentation>{}</xs:documentation>\n\t\t\t\t</xs:annotation>\n\t\t\t</xs:element>\n'
 #eltCompoDsSequenceInExtension = '\t\t\t<xs:element name="{}" type="{}:{}"/>\n'
 
 # ETAPE