From: pascale.noyret <pascale.noyret@edf.fr>
Date: Thu, 15 Oct 2020 07:44:30 +0000 (+0200)
Subject: pour un tag ?
X-Git-Tag: MDM_V0~1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e1f973bb6ac6202ab571e9b309cbd5c774edd74b;p=tools%2Feficas.git

pour un tag ?
---

diff --git a/Efi2Xsd/AccasXsd.py b/Efi2Xsd/AccasXsd.py
index 02db1d13..57433906 100755
--- a/Efi2Xsd/AccasXsd.py
+++ b/Efi2Xsd/AccasXsd.py
@@ -803,15 +803,15 @@ class X_SIMP (X_definition):
        elif first: 
           self.texteElt = eltDsSequence.format(self.nom,self.code,self.nomDuTypePyxb,1,1)
 
-       typeATraduire=self.type[0]
-       if (isinstance(typeATraduire, Accas.UserASSD) or issubclass(typeATraduire, Accas.UserASSD)) : 
-           nomType = self.type[0].__name__
-           self.texteElt = self.texteElt[:-3]+">\n"
-           self.texteElt += "\t"+attributeNameName
-           if len(self.type) == 2 and self.type[1]=='createObject' : self.texteElt += attributeTypeForUserASSDCreation
-           else : self.texteElt += attributeTypeForUserASSDConsommation
-           self.texteElt += "\t"+attributeTypeUtilisateurName.format(nomType)
-           self.texteElt += finTexteElt 
+       #typeATraduire=self.type[0]
+       #if (isinstance(typeATraduire, Accas.UserASSD) or issubclass(typeATraduire, Accas.UserASSD)) : 
+       #    nomType = self.type[0].__name__
+       #    self.texteElt = self.texteElt[:-3]+">\n"
+       #    self.texteElt += "\t"+attributeNameName
+       #    if len(self.type) == 2 and self.type[1]=='createObject' : self.texteElt += attributeTypeForUserASSDCreation
+       #    else : self.texteElt += attributeTypeForUserASSDConsommation
+       #    self.texteElt += "\t"+attributeTypeUtilisateurName.format(nomType)
+       #    self.texteElt += finTexteElt 
 
     
        # self.aCreer est mis a jour ds definitNomDuTypePyxb
diff --git a/Efi2Xsd/balisesXSD.py b/Efi2Xsd/balisesXSD.py
index f2d07d9a..8e2e732f 100644
--- a/Efi2Xsd/balisesXSD.py
+++ b/Efi2Xsd/balisesXSD.py
@@ -68,11 +68,8 @@ finUnion          = '\t\t\t</xs:union>\n'
 # User OR ASSD
 attributeNameName    = '\t\t<xs:attribute name="name" type="xs:string"/>\n'
 attributeTypeForASSD = '\t\t<xs:attribute name="accasType" type="xs:string" fixed="ASSD"/>\n'
-attributeTypeForUserASSDCreation     = '\t\t\t<xs:attribute name="accasType" type="xs:string" fixed="UserASSDCreation"/>\n'
-attributeTypeForUserASSDConsommation = '\t\t\t<xs:attribute name="accasType" type="xs:string" fixed="UserASSDConsommation"/>\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'
-finTexteElt = '\t\t\t</xs:element>\n'
 texteFieldUnitaire="./{}:{}/@name |"
 
 # CATA
diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index 763af011..afc82e80 100755
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -37,7 +37,6 @@ if ihmDir     not in sys.path : sys.path.append(ihmDir)
 if ihmQTDir   not in sys.path : sys.path.append(ihmQTDir)
 if editeurDir not in sys.path : sys.path.append(editeurDir)
 
-
 def lanceEficas(code=None, multi=False, langue='en', labelCode=None):
 #-------------------------------------------------------------------
     """
@@ -107,7 +106,8 @@ def genereXML(code=None):
     if options.fichierCata == None : 
        print ('Use -c cata_name.py')
        return
-    fichier=options.comm[0]
+    try    : fichier=options.comm[0]
+    except : fichier=None
     if fichier==None : 
        print ('comm file is needed')
        return