From: ageay <ageay>
Date: Mon, 16 Aug 2010 12:39:07 +0000 (+0000)
Subject: Correction of bug detected by ParaMEDMEMTest.
X-Git-Tag: V5_1_main_FINAL~66
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e4357864bbfab45c49a5f8425a625c43dd5f763f;p=tools%2Fmedcoupling.git

Correction of bug detected by ParaMEDMEMTest.
---

diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx
index e9a8cf654..1e3856297 100644
--- a/src/MEDLoader/MEDLoader.cxx
+++ b/src/MEDLoader/MEDLoader.cxx
@@ -596,17 +596,15 @@ void MEDLoaderNS::readFieldDoubleDataInMedFile(const char *fileName, const char
   for(int i=0;i<nbFields;i++)
     {
       med_int ncomp=MEDnChamp(fid,i+1);
-      infos.resize(ncomp);
       char *comp=new char[ncomp*MED_TAILLE_PNOM+1];
       char *unit=new char[ncomp*MED_TAILLE_PNOM+1];
       MEDchampInfo(fid,i+1,nomcha,&typcha,comp,unit,ncomp);
-      for(int i=0;i<ncomp;i++)
-        infos[i]=MEDLoaderBase::buildUnionUnit(comp+i*MED_TAILLE_PNOM,unit+i*MED_TAILLE_PNOM);
       std::string curFieldName=MEDLoaderBase::buildStringFromFortran(nomcha,MED_TAILLE_NOM+1);
-      delete [] comp;
-      delete [] unit;
       if(curFieldName==fieldName)
         {
+          infos.resize(ncomp);
+          for(int i=0;i<ncomp;i++)
+            infos[i]=MEDLoaderBase::buildUnionUnit(comp+i*MED_TAILLE_PNOM,MED_TAILLE_PNOM,unit+i*MED_TAILLE_PNOM,MED_TAILLE_PNOM);
           bool found=false;
           for(int j=0;j<tabTypeLgth[typeOfOutField] && !found;j++)
             {
@@ -658,6 +656,8 @@ void MEDLoaderNS::readFieldDoubleDataInMedFile(const char *fileName, const char
                 }
             }
         }
+      delete [] comp;
+      delete [] unit;
     }
   MEDfermer(fid);
 }
@@ -832,7 +832,7 @@ void MEDLoaderNS::readUMeshDataInMedFile(med_idt fid, med_int meshId, DataArrayD
   for(int i=0;i<spaceDim;i++)
     {
       std::string n,u;
-      std::string info=MEDLoaderBase::buildUnionUnit(comp+i*MED_TAILLE_PNOM,unit+i*MED_TAILLE_PNOM);
+      std::string info=MEDLoaderBase::buildUnionUnit(comp+i*MED_TAILLE_PNOM,MED_TAILLE_PNOM,unit+i*MED_TAILLE_PNOM,MED_TAILLE_PNOM);
       coords->setInfoOnComponent(i,info.c_str());
     }
   delete [] comp;
diff --git a/src/MEDLoader/MEDLoaderBase.cxx b/src/MEDLoader/MEDLoaderBase.cxx
index 69b679eab..5bb30ebbd 100644
--- a/src/MEDLoader/MEDLoaderBase.cxx
+++ b/src/MEDLoader/MEDLoaderBase.cxx
@@ -73,13 +73,14 @@ char *MEDLoaderBase::buildEmptyString(int lgth)
   return ret;
 }
 
-std::string MEDLoaderBase::buildUnionUnit(const char *name, const char *unit)
+std::string MEDLoaderBase::buildUnionUnit(const char *name, int nameLgth, const char *unit, int unitLgth)
 {
-  std::string ret(name);
-  if(unit[0]=='\0')
+  std::string ret(buildStringFromFortran(name,nameLgth));
+  std::string unitCpp(buildStringFromFortran(unit,unitLgth));
+  if(unitCpp[0]=='\0')
     return ret;
   ret+=" (";
-  ret+=unit;
+  ret+=unitCpp;
   ret+=")";
   return ret;
 }
diff --git a/src/MEDLoader/MEDLoaderBase.hxx b/src/MEDLoader/MEDLoaderBase.hxx
index 896b65059..fc45856da 100644
--- a/src/MEDLoader/MEDLoaderBase.hxx
+++ b/src/MEDLoader/MEDLoaderBase.hxx
@@ -29,7 +29,7 @@ class MEDLoaderBase
 public:
   static int getStatusOfFile(const char *fileName);
   static char *buildEmptyString(int lgth);
-  static std::string buildUnionUnit(const char *name, const char *unit);
+  static std::string buildUnionUnit(const char *name, int nameLgth, const char *unit, int unitLgth);
   static void splitIntoNameAndUnit(const std::string& s, std::string& name, std::string& unit);
   static void strip(std::string& s);
   static void safeStrCpy(const char *src, int maxLgth, char *dest, int behaviour) throw(INTERP_KERNEL::Exception);