oubli balise

diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index 2a67f369e3fb1cd8e507aaf3fa7ade4386d5ecbf..b925ac67c362f67c4cb12124ca39e3bceb8ebc99 100644 (file)
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -59,9 +59,9 @@ debutTypeSubst    = '\t<xs:group name="{}">   \n\t\t<xs:sequence>\n'
 finTypeSubst      = '\t\t</xs:sequence>\n\t</xs:group>\n'
 substDsSequence   = '\t\t\t<xs:group ref="{}:{}"  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:group>\n'
 #choiceDsBloc     = '\t\t\t<xs:choice minOccurs={}>\n'
-debutChoiceDsBloc = '<xs:choice>\n'
+debutChoiceDsBloc = '\t\t<xs:choice>\n'
 debutChoiceDsBlocAvecMin = '<xs:choice minOccurs="{}">\n'
-finChoiceDsBloc   = '</xs:choice>\n'
+finChoiceDsBloc   = '\t\t</xs:choice>\n'
 debSequenceDsBloc = '<xs:sequence>\n'
 finSequenceDsBloc = '</xs:sequence>\n'
 debutTypeSubstDsBlocFactorise = '\t<xs:group name="{}">\n'
@@ -78,8 +78,13 @@ attributeTypeForASSD = '\t\t<xs:attribute name="sdType" type="xs:string" fixed="
 attributeTypeUtilisateurName = '\t\t<xs:attribute name="typeUtilisateur" type="xs:string" fixed="{}"/>\n'
 producingASSDkeyRefDeclaration='\t<xs:key name="Key_Name_For_{}">\n\t\t<xs:selector xpath="."/>\n\t\t<xs:field xpath="{}"/>\n\t</xs:key>\n'
 texteFieldUnitaire="./{}:{}/@name |"
-defBaseXSDUserAssd='\t<xs:simpleType name="AccasUserAssd">\n\t\t<xs:restriction base="xs:string">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
-defUserAssd='\t<xs:simpleType name="{}_{}">\n\t\t<xs:restriction base="AccasUserAssd">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
+defBaseXSDUserASSD='\t<xs:simpleType name="AccasUserAssd">\n\t\t<xs:restriction base="xs:string">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
+defBaseXSDUserASSDMultiple='\t<xs:simpleType name="AccasUserAssdMultiple">\n\t\t<xs:restriction base="xs:string">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
+
+defUserASSDMultiple='\t<xs:simpleType name="{}">\n\t\t<xs:restriction base="AccasUserAssdMultiple">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
+defUserASSD ='\t<xs:simpleType name="{}">\n\t\t<xs:restriction base="AccasUserAssd">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
+
+defUserASSDOrUserASSDMultiple='\t<xs:simpleType name="{}_{}">\n\t\t<xs:restriction base="{}">\n\t\t</xs:restriction>\n\t</xs:simpleType>\n'
 
 
 # CATA