From b70d3827544c69af3459886f069d23b981ac6e78 Mon Sep 17 00:00:00 2001
From: eficas <>
Date: Fri, 15 Apr 2005 09:39:39 +0000
Subject: [PATCH] PN bug...

---
 Ihm/I_MCSIMP.py               | 9 ++++-----
 generator/generator_homard.py | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index 61ce69d2..5cb84cbe 100644
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -460,7 +460,7 @@ class MCSIMP(I_OBJECT.OBJECT):
               self.cr.fatal("None n'est pas une valeur autorisée")
         else:
            # type,into ...
-	   if v.__class__.__name__=='PARAMETRE' or v.__class__.__name__ == 'ITEM_PARAMETRE':
+	   if v.__class__.__name__ in ('PARAMETRE' , 'EVAL', 'ITEM_PARAMETRE','PARAMETRE_EVAL'):
 	      verif_type=1
 	   else:
 	      verif_type=self.verif_type(val=v,cr=None)
@@ -469,16 +469,15 @@ class MCSIMP(I_OBJECT.OBJECT):
                  if type(v) == types.TupleType :
 	           new_val=[]
 	           for i in v:
-	             if i.__class__.__name__ != 'PARAMETRE': 
-	                if i.__class__.__name__ != 'ITEM_PARAMETRE': 
-		           new_val.append(i)
+	             if i.__class__.__name__  not in ('PARAMETRE','EVAL', 'ITEM_PARAMETRE','PARAMETRE_EVAL'): 
+		          new_val.append(i)
 		   if new_val != [] :
 		     verif_type=self.verif_type(val=new_val,cr=cr)
 		   else :
 		     # Cas d une liste de paramétre
 		     verif_type= 1
 		 else:
-	             verif_type=self.verif_type(val=v,cr=None)
+	             verif_type=self.verif_type(val=v,cr=cr)
            valid = verif_type*self.verif_into(cr=cr)*self.verif_card(cr=cr)
            #
            # On verifie les validateurs s'il y en a et si necessaire (valid == 1)
diff --git a/generator/generator_homard.py b/generator/generator_homard.py
index 78e4b94a..af37cb57 100644
--- a/generator/generator_homard.py
+++ b/generator/generator_homard.py
@@ -108,7 +108,7 @@ class HomardGenerator(PythonGenerator):
       self.assoc['CCGroFro']='GROUP_MA'
 #     self.assoc['CCNoChaI']='NOM_MED' (on doit aussi ajouter 'COMPOSANTE')
       self.assoc['CCNumOrI']='NUME_ORDRE'
-      self.assoc['CCNumPTI']='NUME_ORDRE'
+      self.assoc['CCNumPTI']='NUME_PAS_TEMPS'
      
       self.dico_mot_depend={}
      
@@ -218,7 +218,7 @@ class HomardGenerator(PythonGenerator):
 	   return None
         if (self.dico_mot_clef['COMPOSANTE']== None):
            return None
-        chaine=self.dico_mot_clef['NOM_MED']+' '+self.dico_mot_clef['COMPOSANTE']
+        chaine=self.dico_mot_clef['COMPOSANTE']+' '+self.dico_mot_clef['NOM_MED']
         return chaine
 
    def HOMaiN__(self):
-- 
2.39.2