Changeset 488 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.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/userInterface/src/GWt_pspaApplication.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -287 +287 @@
   //globalParam_->updateGlobals();
 
-  //  dtmanage_->saveConfiguration(nameOfCase_);
-  dtmanage_->saveConfiguration(sessionId(),nameOfCase_);
+  //  dtmanage_->saveConfiguration(sessionId(),nameOfCase_);
 
   // en test: j'ajoute la sauvegarde sur .aml
@@ -308 +307 @@
   removePathFromConfigName(nameOfCase_);
   cout << " nom sans path " << nameOfCase_ << endl;
-  removeExtensionFromConfigName(nameOfCase_);
+    removeExtensionFromConfigName(nameOfCase_, string(".aml"));
+    //  removeExtensionFromConfigName(nameOfCase_, string(".save"));
   cout << " nom sans extension " << nameOfCase_ << endl;
   if (nameOfCase_ == "") return;
@@ -314 +314 @@
   dialogSave_ = NULL;
   
-  bool test = dtmanage_->restoreElements(fileName);
+  //  bool test = dtmanage_->restoreElements(fileName);
+  bool test = dtmanage_->restoreAMLElements(fileName);
   if ( !test ) {
     GWt_dialog restoreWarning(" element restoring", "failure in restoring elements from file : " + fileName , GWt_dialog::Error, false,true);
@@ -364 +365 @@
   string nomDuFichier = (uploadFileSelectorWidget_->clientFileName()).toUTF8();
   cout << " fichier client : " << nomDuFichier << endl;
-  bool test = removeExtensionFromConfigName(nomDuFichier);
+  bool test = removeExtensionFromConfigName(nomDuFichier, string(".aml"));
   cout << " fichier client sans extension : " << nomDuFichier << endl;
   
@@ -371 +372 @@
     console_->addConsoleMessage(string("restauration..."));
       
-    if ( !dtmanage_->restoreElements(uploadFileSelectorWidget_->spoolFileName()) ) {
+    if ( !dtmanage_->restoreAMLElements(uploadFileSelectorWidget_->spoolFileName()) ) {
       GWt_dialog restoreWarning(" element restoring", "failure in restoring elements !", GWt_dialog::Error, false,true);
       restoreWarning.exec();
@@ -582 +583 @@
 }
 
-bool PspaApplication::removeExtensionFromConfigName(string& config)
+bool PspaApplication::removeExtensionFromConfigName(string& config, string extension)
 {
     //  string configName;
-    string extension(".save");
+  //    string extension(".save");
     bool test = true;
     string::size_type nn = config.rfind('.');