*** empty log message ***

[tools/eficas.git] / Noyau / N_PROC_ETAPE.py

diff --git a/Noyau/N_PROC_ETAPE.py b/Noyau/N_PROC_ETAPE.py
index 3ebc123c45293c575ca9fd0c3d4821588361c62e..ded57551c462cf1a5d88e48156b94294737f3455 100644 (file)
--- a/Noyau/N_PROC_ETAPE.py
+++ b/Noyau/N_PROC_ETAPE.py
@@ -1,3 +1,26 @@
+#@ MODIF N_PROC_ETAPE Noyau  DATE 14/09/2004   AUTEUR MCOURTOI M.COURTOIS 
+# -*- coding: iso-8859-1 -*-
+#            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 PROC_ETAPE qui sert à vérifier et à exécuter
     une procédure
@@ -77,13 +100,10 @@ class PROC_ETAPE(N_ETAPE.ETAPE):
                apply(self.definition.op_init,(self,self.parent.g_context))
          else:
             pass
-         if self.jdc.par_lot == "NON" :
-            self.Execute()
       except AsException,e:
         raise AsException("Etape ",self.nom,'ligne : ',self.appel[0],
                               'fichier : ',self.appel[1],e)
       except EOFError:
-        self.reset_current_step()
         raise
       except :
         l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2])
@@ -91,10 +111,13 @@ class PROC_ETAPE(N_ETAPE.ETAPE):
                           'fichier : ',self.appel[1]+'\n',
                           string.join(l))
 
+      self.Execute()
+      return None
+
    def supprime(self):
       """
          Méthode qui supprime toutes les références arrières afin que l'objet puisse
-         être correctement détruit par le garbage collector
+         etre correctement détruit par le garbage collector
       """
       N_MCCOMPO.MCCOMPO.supprime(self)
       self.jdc=None