From 5331e5d68ae55041c63babf37591e27e86f920de Mon Sep 17 00:00:00 2001
From: "pascale.noyret" <pascale.noyret@edf.fr>
Date: Tue, 26 Nov 2019 17:45:34 +0100
Subject: [PATCH] sauve du 26

---
 Efi2Xsd/AccasXsd.py   | 19 ++++++++++++++-----
 Efi2Xsd/MCAccasXML.py |  2 +-
 Efi2Xsd/balisesXSD.py |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index 5277c8d5..0a4161e5 100755
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -327,24 +327,33 @@ class X_JDC_CATA :
 
     def dumpXsd(self):
         cata = CONTEXT.getCurrentCata() 
-        self.nomDuCodeDumpe=self.labelCode
 
-        print ('self.implementing -------------------', self.implementing)
+        print ('self.implement  -------------------', self.implement)
+        print ('self.importedBy -------------------', self.importedBy)
 
         self.texteSimple   = ""
         self.texteComplexe = ""
         self.texteCata     = ""
+        print ('todo --> quel est le nom a mettre')
+        self.texteCata     = debutTypeCata.format('PNPNPNPN')
 
-        if self.implementing == "" :
+        # a verifier
+        if self.implement == "" :
+           self.nomDuCodeDumpe=self.labelCode
+        else :
+           self.nomDuCodeDumpe = self.implement
+
+        if self.implement == "" :
            self.texteCata     = texteDebut.format(self.nomDuCodeDumpe,self.nomDuCodeDumpe,self.nomDuCodeDumpe)
-           self.texteCata    += includeCata.format(self.nomDuCodeDumpe)
            self.inExtension = False
         else :
            self.inExtension = True
+           self.texteSimple += TypeEtEltAbstraitCodeSpec.format(self.nomDuCodeDumpe,self.nomDuCodeDumpe, self.nomDuCodeDumpe, self.nomDuCodeDumpe,)
+           self.texteCata   += includeCata.format(self.nomDuCodeDumpe)
+           self.texteCata   += EltCodeSpecDsCata.format(self.nomDuCodeDumpe)
 
         self.texteElt      = ""
         self.nomDuTypePyxb = 'T_'+self.nomDuCodeDumpe
-        self.texteCata     = debutTypeCata.format(self.nomDuTypePyxb)
 
         self.dumpLesCommandes()
 
diff --git a/Efi2Xsd/MCAccasXML.py b/Efi2Xsd/MCAccasXML.py
index 84c334dd..ea2fc7c0 100755
--- a/Efi2Xsd/MCAccasXML.py
+++ b/Efi2Xsd/MCAccasXML.py
@@ -28,7 +28,7 @@ class X_OBJECT:
       if self.nom == 'Consigne' : return None
       trouve = False
       
-      if debug : print self.perePyxb.objPyxb.orderedContent()
+      if debug : print (self.perePyxb.objPyxb.orderedContent())
       if debug : print (map(lambda o:o.value, self.perePyxb.objPyxb.orderedContent()))
       
       elt=pyxb.binding.basis.ElementContent(self.objPyxb, instance=self.perePyxb.objPyxb, tag=pyxb.namespace.ExpandedName(self.cata.modeleMetier.Namespace, self.nom))
diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index 1fd572f4..5e8545ca 100644
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -48,7 +48,7 @@ debutTypeCata = '\t<xs:complexType name="{}">\n\t\t<xs:choice minOccurs="0" maxO
 finTypeCata   = '\t\t</xs:choice>\n\t</xs:complexType>\n'
 finSchema     = '</xs:schema>'
 eltCata = '\t<xs:element name="{}" type="{}:{}"/>\n'
-TypeEtEltAbstraitCodeSpec  = '\t<xs:complexType name="T_Code_Specific" abstract="true"/>\n\t<xs:element name="Code_Specific" type="{}:T_Code_Specific"/>\n'
+TypeEtEltAbstraitCodeSpec  = '\t<xs:complexType name="T_{}_Specific" abstract="true"/>\n\t<xs:element name="{}_Specific" type="{}:T_{}_Specific"/>\n'
 EltCodeSpecDsCata='\t\t\t<xs:element ref="{}:Code_Specific" minOccurs="0" maxOccurs="1"/>\n'
 includeCata = '\t<xs:include schemaLocation="cata_{}_genere.xsd" />\n\n'
 
-- 
2.39.2