From: pascale.noyret <pascale.noyret@edf.fr>
Date: Tue, 20 Oct 2020 15:44:53 +0000 (+0200)
Subject: chgt de _sdName en sdName
X-Git-Tag: MDM_V0.1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a09c752d1665581be4c7a8670d0d3ad755899e1e;p=tools%2Feficas.git

chgt de _sdName en sdName
---

diff --git a/Efi2Xsd/MCAccasXML.py b/Efi2Xsd/MCAccasXML.py
index 154d3865..fc10764e 100755
--- a/Efi2Xsd/MCAccasXML.py
+++ b/Efi2Xsd/MCAccasXML.py
@@ -367,7 +367,7 @@ class X_ETAPE(X_MCCOMPO) :
    def metAJourNomASSD(self, nom,debug=False):
       if not self.cata or not self.cata.modeleMetier : return
       if debug : print ('X_ETAPE metAJourLesAttributs', self.nom, nom,' --------------------------')
-      self.objPyxb._sdName=nom
+      self.objPyxb.sdName=nom
 
 class X_JDC (X_MCCOMPO):
 # ---------------------
@@ -444,9 +444,9 @@ class X_JDC (X_MCCOMPO):
           if debug : print ('dictArgs ',objEtape.dictArgs)
           if debug : print ('dictPyxb ',objEtape.dictPyxb)
           # attention au call d Oper qui renomme l objet pyxb
-          if hasattr(objEtape,'_sdName') :  
-             if debug and hasattr(objEtape,'_sdName') :print ('sdName',objEtape._sdName)
-             objAccasEtape=maClasseAccas(nomXML=objEtape._sdName, **(objEtape.dictArgs))
+          if hasattr(objEtape,'sdName') :  
+             if debug and hasattr(objEtape,'sdName') :print ('sdName',objEtape.sdName)
+             objAccasEtape=maClasseAccas(nomXML=objEtape.sdName, **(objEtape.dictArgs))
           else : objAccasEtape=maClasseAccas(**(objEtape.dictArgs))
           if debug : print ( 'hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh')
       
diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index afb61aac..6cbd9c65 100644
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -66,8 +66,8 @@ finUnion          = '\t\t\t</xs:union>\n'
 
 
 # User OR ASSD
-attributeNameName    = '\t\t<xs:attribute name="_sdName" type="xs:string"/>\n'
-attributeTypeForASSD = '\t\t<xs:attribute name="_sdType" type="xs:string" fixed="ASSD"/>\n'
+attributeNameName    = '\t\t<xs:attribute name="sdName" type="xs:string"/>\n'
+attributeTypeForASSD = '\t\t<xs:attribute name="sdType" type="xs:string" fixed="ASSD"/>\n'
 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 |"