Changeset 488 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Feb 7, 2014, 2:00:55 PM (10 years ago)

Author:

lemeur

Message:

lecture fichier sauvegarde AML

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (4 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -14 +14 @@
 #include "UAP/UAPUtilities.hpp"
 #include "AML/AMLReader.hpp"
+#include "AMLtools.h"
 
 #define BAVARD 0
@@ -139 +140 @@
 }
 
-void dataManager::saveConfiguration(string folder, string nameOfFile)
-{
-  ofstream outfile;
-  //string name = pspa_->getWorkingDir()+ folder + "/" + nameOfFile + ".save";
-  cout << " dataManager::saveConfiguration : suppression du folder dans le nom de " << endl;
-  cout << " sauvegarde, en attendant que ce soit autre chose que le sessionId" << endl;
-  cout << " et qu'on puisse restaurer normalement" << endl;
-
-  string name = pspa_->getWorkingDir() + "/" + nameOfFile + ".save";  
-  // make dir if not exist
-  boost::filesystem::create_directories(pspa_->getWorkingDir() + folder + "/");
-  
-  outfile.open(name.c_str(), ios::out);
-  if (!outfile) {
-    cerr<<" ERROR opening output file for persistency "<<name<<endl;
-  }
-  
-  outfile << globParam_.FileOutputFlow();
-
-  // FIXME Francois: Comment sauver la configuration des section ?
-  for (unsigned int a=0; a< jobList_.size(); a++) {
-    outfile << jobList_[a]->getSectorParameters().FileOutputFlow();
-  }
-  // END
-  
-  abstractElement* elPtr;
-  for (unsigned k = 0; k < jobList_.size(); k++) {
-    sector* sector = jobList_[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      for (unsigned m = 0; m < section->getElements().size(); m++) {
-        elPtr = section->getElements()[m];
-        outfile << elPtr->FileOutputFlow();
-      }
-    }
-  }
-  outfile.close();
-}
+// void dataManager::saveConfiguration(string folder, string nameOfFile)
+// {
+//   ofstream outfile;
+//   //string name = pspa_->getWorkingDir()+ folder + "/" + nameOfFile + ".save";
+//   cout << " dataManager::saveConfiguration : suppression du folder dans le nom de " << endl;
+//   cout << " sauvegarde, en attendant que ce soit autre chose que le sessionId" << endl;
+//   cout << " et qu'on puisse restaurer normalement" << endl;
+
+//   string name = pspa_->getWorkingDir() + "/" + nameOfFile + ".save";  
+//   // make dir if not exist
+//   boost::filesystem::create_directories(pspa_->getWorkingDir() + folder + "/");
+  
+//   outfile.open(name.c_str(), ios::out);
+//   if (!outfile) {
+//     cerr<<" ERROR opening output file for persistency "<<name<<endl;
+//   }
+  
+//   outfile << globParam_.FileOutputFlow();
+
+//   // FIXME Francois: Comment sauver la configuration des section ?
+//   for (unsigned int a=0; a< jobList_.size(); a++) {
+//     outfile << jobList_[a]->getSectorParameters().FileOutputFlow();
+//   }
+//   // END
+  
+//   abstractElement* elPtr;
+//   for (unsigned k = 0; k < jobList_.size(); k++) {
+//     sector* sector = jobList_[k];
+//     for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+//       sectionToExecute* section = sector->getSectionsToExecute()[l];
+//       for (unsigned m = 0; m < section->getElements().size(); m++) {
+//         elPtr = section->getElements()[m];
+//         outfile << elPtr->FileOutputFlow();
+//       }
+//     }
+//   }
+//   outfile.close();
+// }
 
 // ecriture sur fichier AML
@@ -219 +220 @@
 }
 
-bool dataManager::restoreElements(string inputFileName)
+// bool dataManager::restoreElements(string inputFileName)
+// {
+//   cout << "***********************************" << endl;
+//   cout << " dataManager::restoreElements() fichier :" << inputFileName << endl << endl;
+
+//   ifstream infile;
+//   string name = inputFileName;
+//   infile.open(name.c_str(), ios::in);
+//   if (!infile) {
+//     cerr << " error opening input stream " << name << endl;
+//     return false;
+//   }
+//   else cout << " successful opening input stream : " << name << endl;
+  
+//   //NOTE:: je ne sais pas si les "secteurs" seront conservés, aussi pour ne pas trop changer les fichiers je lis les données aprÚs "globals" dans la boucle 
+  
+//   // Clear the BeamLine
+//   jobList_.clear();
+
+//   // FIXME : For test purpose !!!
+//   sector* mySect = addNewSector();
+  
+//   nomdElements::typedElement elementType;
+//   string elementLabel;
+//   abstractElement* nouveau = NULL;
+//   while (infile >> elementLabel) {
+//     if (elementLabel == string("globals") ) {
+//       globParam_.raz();
+//       globParam_.FileInput(infile);
+//     } else if (elementLabel == string("sectors") ) {
+//       // FIXME Francois !!!!!!!
+// //      sectorParam_.raz();
+// //      sectorParam_.FileInput(infile);
+//       // END
+//     } else {
+//       elementType = nomdElements::getTypeFromLabel(elementLabel);
+//       nouveau = mySect->addElementAfter(elementType,nouveau);
+//       if ( nouveau == NULL ) {
+//      cerr << " dataManager::restoreElements() : restore element " << elementLabel << " failed " << endl;
+//      return false;
+//       } else {
+//      nouveau->FileInput(infile);
+//       }
+//     }
+//   }// while
+  
+// #if BAVARD > 1
+// /*  unsigned k;
+//   for(k = 0; k < getBeamLineSize(); k++) {
+//     abstractElement* ptr = pspa_->getBeamLine_deprecated()->getAbstractElement(k);
+//     cout << "recupere " << ptr->getLabel() << endl;
+//   }
+// */
+// #endif
+
+//   infile.close();
+//   return true;
+// }
+
+bool dataManager::restoreAMLElements(string inputFileName)
 {
   cout << "***********************************" << endl;
-  cout << " dataManager::restoreElements() fichier :" << inputFileName << endl << endl;
-
-  ifstream infile;
-  string name = inputFileName;
-  infile.open(name.c_str(), ios::in);
-  if (!infile) {
-    cerr << " error opening input stream " << name << endl;
+  cout << " dataManager::restoreAMLElements() fichier :" << inputFileName << endl << endl;
+
+  AMLReader reader;
+  UAPNode* uap_root = NULL;
+  uap_root = reader.AMLFileToAMLRep (inputFileName);
+  if ( !uap_root ) {
+    cout << " dataManager::restoreAMLElements ERREUR AML lecture fichier  " << inputFileName << endl;
     return false;
   }
-  else cout << " successful opening input stream : " << name << endl;
-  
+
+  else cout << " successful opening  : " << inputFileName << " UAP_ROOT= " << uap_root->getName() << endl;
+  UAPNode* uap_labname = NULL;
+
+NodeVec laboratories = uap_root->getSubNodesByName(string("laboratory"));
+ cout << " dataManager::restoreAMLElements nombre de <laboratory> : " << laboratories.size() << endl;
+
+ uap_labname = *laboratories.begin();
+
+ if ( !uap_labname ) {
+   cout << " dataManager::restoreAMLElements : fichier non conforme, on ne trouve pas <laboratory...> " << endl;
+ } else {
+   cout << " dataManager::restoreAMLElements : GO !" << endl;
+ }
+
+
   //NOTE:: je ne sais pas si les "secteurs" seront conservés, aussi pour ne pas trop changer les fichiers je lis les données aprÚs "globals" dans la boucle 
   
@@ -241 +315 @@
   sector* mySect = addNewSector();
   
+
+   UAPNode* parametresGlobaux = uap_labname->getChildByName(string("global"));
+  if ( !parametresGlobaux ) {
+    cout << " dataManager::restoreAMLElements GLOBAUX NON TROUVES " << endl;
+  } else {
+    cout << " dataManager::restoreAMLElements GENIAL ! " << endl;
+  }
+  globParam_.raz();
+  globParam_.FileAMLInput(parametresGlobaux);
+
+
   nomdElements::typedElement elementType;
   string elementLabel;
   abstractElement* nouveau = NULL;
-  while (infile >> elementLabel) {
-    if (elementLabel == string("globals") ) {
-      globParam_.raz();
-      globParam_.FileInput(infile);
-    } else if (elementLabel == string("sectors") ) {
-      // FIXME Francois !!!!!!!
-//      sectorParam_.raz();
-//      sectorParam_.FileInput(infile);
-      // END
-    } else {
-      elementType = nomdElements::getTypeFromLabel(elementLabel);
-      nouveau = mySect->addElementAfter(elementType,nouveau);
+
+
+  NodeVec sectorNode = uap_root->getSubNodesByName(string("sector"));
+
+  if ( !sectorNode.size() ) {
+    cout << " dataManager::restoreAMLElements ERREUR lecture fichier : pas de sectors ? " << endl;
+    return false;
+  }
+
+
+  NodeVec& listElem = ( *sectorNode.begin() )->getChildren();
+  if (  !listElem.size() ) {
+    cout << " dataManager::restoreAMLElements ERREUR lecture fichier : pas d'elements ? " << endl;
+    return false;
+  } else {
+    cout << " dataManager::restoreAMLElements : liste elements non vide : SUCCES " << endl;
+  }
+
+  for (NodeVecIter iter = listElem.begin(); iter != listElem.end(); iter++) {
+
+    string nomNoeud = (*iter)->getName();
+    if ( nomNoeud != string("element") ) {
+      cout << " le secteur contient un non-element : " << nomNoeud << endl;
+      continue;
+    }
+
+    UAPAttribute* att = NULL;
+    att = (*iter)->getAttribute("name");
+
+    cout << " dataManager::restoreAMLElements trouve element " << att->getValue();
+
+    string nomGenerique;
+    AMLtools::readAMLParameterAttribut(*iter, "description", "type", nomGenerique);
+
+    // UAPNode*  genericName = (*iter)->getChildByName("description");
+    // att = genericName->getAttribute("type");
+
+    cout <<  " de type " << nomGenerique << endl;
+
+
+    elementType = nomdElements::getTypeFromLabel(nomGenerique);
+    nouveau = mySect->addElementAfter(elementType,nouveau);
+
       if ( nouveau == NULL ) {
-        cerr << " dataManager::restoreElements() : restore element " << elementLabel << " failed " << endl;
+        cerr << " dataManager::restoreAMLElements() : restore element " << att->getValue() << " failed " << endl;
         return false;
       } else {
-        nouveau->FileInput(infile);
+        nouveau->FileAMLInput(*iter); 
       }
-    }
-  }// while
-  
-#if BAVARD > 1
-/*  unsigned k;
-  for(k = 0; k < getBeamLineSize(); k++) {
-    abstractElement* ptr = pspa_->getBeamLine_deprecated()->getAbstractElement(k);
-    cout << "recupere " << ptr->getLabel() << endl;
-  }
-*/
-#endif
-
-  infile.close();
+  }
+
+  
   return true;
 }
+
 
 particleBeam* dataManager::getDiagnosticBeam(unsigned index)