CCAR: mise a jour proc distrib

[tools/eficas.git] / Editeur / analyse_catalogue.py

diff --git a/Editeur/analyse_catalogue.py b/Editeur/analyse_catalogue.py
index b52a564f8d9e21e398f01a1572d12579492b0f6e..2a0d4a0be46d3fe2128d7e6910576732ce5aff62 100644 (file)
--- a/Editeur/analyse_catalogue.py
+++ b/Editeur/analyse_catalogue.py
@@ -1,9 +1,21 @@
-#@ MODIF analyse_catalogue Accas  DATE 02/07/2001   AUTEUR D6BHHJP J.P.LEFEBVRE 
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
-# COPYRIGHT (C) 1991 - 2001  EDF R&D                  WWW.CODE-ASTER.ORG
-#              SEE THE FILE "LICENSE.TERMS" FOR INFORMATION ON USAGE AND
-#              REDISTRIBUTION OF THIS FILE.
+# 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.
+#
+#
 # ======================================================================
 from string import split,strip,lowercase,uppercase
 import re,string,cPickle,os
@@ -11,8 +23,8 @@ import re,string,cPickle,os
 from Noyau.N_CR import CR
 
 #
-__Id__="$Id: analyse_catalogue.py,v 1.13.18.3 2001/06/19 12:24:48 iliade Exp $"
-__version__="$Name: FR_28_06_10_00 $"
+__Id__="$Id: analyse_catalogue.py,v 1.2 2002/05/15 15:31:58 eficas Exp $"
+__version__="$Name:  $"
 #
 l_noms_commandes = ['OPER','PROC','MACRO','FORM']
 l_noms_composes=['FACT','BLOC','NUPL','FORM']
@@ -92,15 +104,15 @@ class ENTITE :
                l=[]
                d={}
                if len(self.children)==0:
-                       self.liste = l
-                       self.dico = d
+                       self.ordre_mc = l
+                       self.entites = d
                        return
                try :
                        for child in self.children:
                                l.append(child.nom)
                                d[child.nom]=child
-                       self.liste = l
-                       self.dico = d
+                       self.ordre_mc = l
+                       self.entites = d
                except:
                        print 'erreur :',self.nom,self.__class__
                
@@ -254,8 +266,8 @@ class CATALOGUE_CATA:
                for cmd in self.liste_commandes:
                        l.append(cmd.nom)
                        d[cmd.nom]=cmd
-               self.liste = l
-               self.dico = d
+               self.ordre_mc = l
+               self.entites = d
 
        def report(self):
                """ retourne l'objet rapport du catalogue de commande """
@@ -283,7 +295,7 @@ def make_cata_pickle(fic_cata):
   cata_ordonne = analyse_catalogue(None,fic_cata)
   f = open(fic_cata_p,'w+')
   p = cPickle.Pickler(f)
-  p.dump(cata_ordonne.dico)
+  p.dump(cata_ordonne.entites)
   f.close()
   
 if __name__ == "__main__" :