CCAR: modifications pour INCLUDE; ajout du viewer d'INCLUDE

[tools/eficas.git] / Validation / V_MCLIST.py

diff --git a/Validation/V_MCLIST.py b/Validation/V_MCLIST.py
index 0dcc38f316ed1ff01fb764f332459132c5f83d43..88e2cfd36aeda4056397a7092de607a6d31aa674 100644 (file)
--- a/Validation/V_MCLIST.py
+++ b/Validation/V_MCLIST.py
@@ -1,3 +1,23 @@
+#@ MODIF V_MCLIST Validation  DATE 29/05/2002   AUTEUR DURAND C.DURAND 
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR   
+# (AT YOUR OPTION) ANY LATER VERSION.                                 
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT 
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF          
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU    
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                            
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE   
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
+#                                                                       
+#                                                                       
+# ======================================================================
 """
    Ce module contient la classe mixin MCList qui porte les méthodes
    nécessaires pour réaliser la validation d'un objet de type MCList
@@ -44,7 +64,7 @@ class MCList:
         num = num+1
         if not i.isvalid():
           if cr=='oui':
-            self.cr.fatal(string.join(["L'occurrence n°",`num`," du mot-clé facteur :",self.nom," n'est pas valide"]))
+            self.cr.fatal(string.join(["L'occurrence n",`num`," du mot-clé facteur :",self.nom," n'est pas valide"]))
           test = 0
       return test
 
@@ -54,6 +74,8 @@ class MCList:
       """
       self.cr=self.CR( debut = "Mot-clé facteur multiple : "+self.nom,
                   fin = "Fin Mot-clé facteur multiple : "+self.nom)
+      for i in self.data:
+        self.cr.add(i.report())
       # XXX j'ai mis l'état en commentaire car il n'est utilisé ensuite
       #self.state = 'modified'
       try :
@@ -61,7 +83,5 @@ class MCList:
       except AsException,e:
         if CONTEXT.debug : traceback.print_exc()
         self.cr.fatal(string.join(["Mot-clé facteur multiple : ",self.nom,str(e)]))
-      for i in self.data:
-        self.cr.add(i.report())
       return self.cr