Changeset bd86e8 for molecuilder/src/builder.cpp

Timestamp:

Jul 9, 2009, 11:01:08 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

ab7b5e7

Parents:

c12297

git-author:

Frederik Heber <heber@…> (07/09/09 10:59:00)

git-committer:

Frederik Heber <heber@…> (07/09/09 11:01:08)

Message:

Changed the unsatisfactory PathToDatabases construct, removing warning deprecated conversion from string constant to char *

• new variable config::databasepath (initialized in config constructor, released in destructor)
• Store.../LoadPeriodentafel() now have to receive const char *
• PathToDatabases is removed, instead LocalPath is copied into config::databasepath

File:

• molecuilder/src/builder.cpp (modified) (7 diffs)

molecuilder/src/builder.cpp

@@ -1208 +1208 @@
  * \return exit code (0 - successful, all else - something's wrong)
  */
-static int ParseCommandLineOptions(int argc, char **argv, MoleculeListClass *&molecules, periodentafel *&periode, config& configuration, char *&ConfigFileName, char *&PathToDatabases)
+static int ParseCommandLineOptions(int argc, char **argv, MoleculeListClass *&molecules, periodentafel *&periode, config& configuration, char *&ConfigFileName)
 {
         Vector x,y,z,n; // coordinates for absolute point in cell volume
@@ -1223 +1223 @@
         clock_t start,end;
         int argptr;
-        PathToDatabases = LocalPath;
+  strncpy(configuration.databasepath, LocalPath, MAXSTRINGSIZE-1);
 
         // simply create a new molecule, wherein the config file is loaded and the manipulation takes place
@@ -1285 +1285 @@
                                                 } else {
                                                         cout << "Using " << argv[argptr] << " as elements database." << endl;
-                                                        PathToDatabases = argv[argptr];
+                                                        strncpy (configuration.databasepath, argv[argptr], MAXSTRINGSIZE-1);
                                                         argptr+=1;
                                                 }
@@ -1302 +1302 @@
 
                 // 2. Parse the element database
-                if (periode->LoadPeriodentafel(PathToDatabases)) {
+                if (periode->LoadPeriodentafel(configuration.databasepath)) {
                         cout << Verbose(0) << "Element list loaded successfully." << endl;
                         //periode->Output((ofstream *)&cout);
@@ -1771 +1771 @@
                 }
         } else {        // no arguments, hence scan the elements db
-                if (periode->LoadPeriodentafel(PathToDatabases))
+                if (periode->LoadPeriodentafel(configuration.databasepath))
                         cout << Verbose(0) << "Element list loaded successfully." << endl;
                 else
@@ -1794 +1794 @@
         string line;
         char *ConfigFileName = NULL;
-        char *ElementsFileName = NULL;
         int j, count;
 
         // =========================== PARSE COMMAND LINE OPTIONS ====================================
-        j = ParseCommandLineOptions(argc, argv, molecules, periode, configuration, ConfigFileName, ElementsFileName);
+        j = ParseCommandLineOptions(argc, argv, molecules, periode, configuration, ConfigFileName);
         if (j == 1) return 0; // just for -v and -h options
         if (j) return j;        // something went wrong
@@ -1889 +1888 @@
 
         // save element data base
-        if (periode->StorePeriodentafel(ElementsFileName)) //ElementsFileName
+        if (periode->StorePeriodentafel(configuration.databasepath)) //ElementsFileName
                 cout << Verbose(0) << "Saving of elements.db successful." << endl;
         else