Changeset 7b1cea for molecuilder/src/config.cpp

Timestamp:

Apr 29, 2008, 7:04:59 AM (18 years ago)

Author:

Frederik Heber <heber@…>

Children:

2456db

Parents:

36b128

Message:

configname is also stored in config structure, GetDefaultPath by config::configpath replaced

This stores fragment and affiliated files in same dir as the config, regardless of therein contained paths and is safer and makes the tests work.

File:

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

molecuilder/src/config.cpp

@@ -17 +17 @@
   pseudopotpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
   configpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
+  configname = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
   strcpy(mainname,"pcp");
   strcpy(defaultpath,"not specified");
@@ -88 +89 @@
   Free((void **)&pseudopotpath, "config::~config: *pseudopotpath");
   Free((void **)&configpath, "config::~config: *configpath");
+  Free((void **)&configname, "config::~config: *configname");
 };
 
@@ -406 +408 @@
  * \param *filename config file string
  */
-void config::RetrieveConfigPath(char *filename)
+void config::RetrieveConfigPathAndName(char *filename)
 {
+  char *ptr = NULL;
   int last = -1;
   for(int i=0;i<255;i++) {
@@ -417 +420 @@
   if (last == -1) { // no path in front, set to local directory.
     strcpy(configpath, "./");
+    ptr = filename;
   } else {
     strncpy(configpath, filename, last+1);
+    ptr = &filename[last+1];
     if (last < 254)
       configpath[last+1]='\0';
   }
-  cout << "Found configpath: " << configpath << ", dir slash was found at " << last << "." << endl;
+  strcpy(configname, ptr);
+  cout << "Found configpath: " << configpath << ", dir slash was found at " << last << ", config name is " << configname << "." << endl;
 };
 
@@ -438 +444 @@
     return;
   }
-  RetrieveConfigPath(filename);
+  RetrieveConfigPathAndName(filename);
   // ParseParameters
   
@@ -669 +675 @@
     return;
   }
-  RetrieveConfigPath(filename);
+  RetrieveConfigPathAndName(filename);
   // ParseParameters