Changeset f5306f for molecuilder/src/config.cpp

Timestamp:

Apr 29, 2008, 6:30:38 AM (18 years ago)

Author:

Frederik Heber <heber@…>

Children:

dac5c5

Parents:

661288

Message:

config::Load..() now get filename instead of pointer to file, bugfix for switch structure in command line parsin
g.

Load..() functions RetrieveConfigPath() - the path that is given for the config file on the command line - and p
ut it into config::configpath. This is necessary to allow later for a sensible storage path under fragmentation, as the old with defaultpath from the file was stupid, if the given path was wrong (whereas the config path always exists).
Switch structure in parsing the command line options needed to make better use of the already present flag in or
der to know when to just save and stop and when to continue to the interactive menu.

File:

• molecuilder/src/config.cpp (modified) (8 diffs)

molecuilder/src/config.cpp

@@ -16 +16 @@
   defaultpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
   pseudopotpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
+  configpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
   strcpy(mainname,"pcp");
-  strcpy(defaultpath,"not specified                                                                                                                                                                                                                                               ");
-  strcpy(pseudopotpath,"not specified                                                                                                                                                                                                                                               ");
+  strcpy(defaultpath,"not specified");
+  strcpy(pseudopotpath,"not specified");
   
   ProcPEGamma=8;
@@ -86 +87 @@
   Free((void **)&defaultpath, "config::~config: *defaultpath");
   Free((void **)&pseudopotpath, "config::~config: *pseudopotpath");
+  Free((void **)&configpath, "config::~config: *configpath");
 };
 
@@ -352 +354 @@
 
 /** Tests whether a given configuration file adhears to old or new syntax.
- * \param *file input file stream being the opened config file
+ * \param *filename filename of config file to be tested
  * \param *periode pointer to a periodentafel class with all elements
  * \param *mol pointer to molecule containing all atoms of the molecule
  * \return 0 - old syntax, 1 - new syntax, -1 - unknown syntax 
  */
-int config::TestSyntax(ifstream *file, periodentafel *periode, molecule *mol)
+int config::TestSyntax(char *filename, periodentafel *periode, molecule *mol)
 {
   int test;
+  ifstream file(filename);
+  
   // search file for keyword: ProcPEGamma (new syntax)
-  if (ParseForParameter(1,file,"ProcPEGamma", 0, 1, 1, int_type, &test, 1, optional))
+  if (ParseForParameter(1,&file,"ProcPEGamma", 0, 1, 1, int_type, &test, 1, optional)) {
+    file.close();
     return 1;
+  }
   // search file for keyword: ProcsGammaPsi (old syntax)
-  if (ParseForParameter(1,file,"ProcsGammaPsi", 0, 1, 1, int_type, &test, 1, optional))
+  if (ParseForParameter(1,&file,"ProcsGammaPsi", 0, 1, 1, int_type, &test, 1, optional)) {
+    file.close();
     return 0;
+  }
+  file.close();
   return -1;
 }
@@ -394 +403 @@
 };
 
+/** Retrieves the path in the given config file name.
+ * \param *filename config file string
+ */
+void config::RetrieveConfigPath(char *filename)
+{
+  int last = -1;
+  for(int i=0;i<255;i++) {
+    if (filename[i] == '/')
+      last = i;
+    if (filename[i] == '\0')
+      break;
+  }
+  if (last == -1) { // no path in front, set to local directory.
+    strcpy(configpath, "./");
+  } else {
+    strncpy(configpath, filename, last+1);
+    if (last < 254)
+      configpath[last+1]='\0';
+  }
+  cout << "Found configpath: " << configpath << ", dir slash was found at " << last << "." << endl;
+};
+
+
 /** Initializes config file structure by loading elements from a give file.
  * \param *file input file stream being the opened config file
@@ -399 +431 @@
  * \param *mol pointer to molecule containing all atoms of the molecule 
  */
-void config::Load(ifstream *file, periodentafel *periode, molecule *mol)
+void config::Load(char *filename, periodentafel *periode, molecule *mol)
 {
+  ifstream *file = new ifstream(filename);
+  if (file == NULL) {
+    cerr << "ERROR: config file " << filename << " missing!" << endl;
+    return;
+  }
+  RetrieveConfigPath(filename);
   // ParseParameters
   
@@ -615 +653 @@
     }
   }
+  file->close();
+  delete(file);
 };
 
@@ -622 +662 @@
  * \param *mol pointer to molecule containing all atoms of the molecule 
  */
-void config::LoadOld(ifstream *file, periodentafel *periode, molecule *mol)
+void config::LoadOld(char *filename, periodentafel *periode, molecule *mol)
 {
+  ifstream *file = new ifstream(filename);
+  if (file == NULL) {
+    cerr << "ERROR: config file " << filename << " missing!" << endl;
+    return;
+  }
+  RetrieveConfigPath(filename);
   // ParseParameters
   
@@ -810 +856 @@
     }
   }   
+  file->close();
+  delete(file);
 };