refractor: moved global variables to settings struct

src/libfiles/export.cpp

@@ -47,21 +47,21 @@ using namespace std;
 settings setting;
 
 EXPORTED void setFileName(char* file){
-	_filename = file;
+	setting.filename = file;
 }
 
 
 EXPORTED void setLogFile(char* file){
-	_logfile = file;
+	setting.logfile = file;
 }
 
 EXPORTED void setOutputName(char* outName){
-	_outName = outName;
-	_setOutput = true;
+	setting.outname = outName;
+	setting.outputNameSet = true;
 }
 
 EXPORTED int execPipeline(){
-	return executePipeline(_filename);
+	return executePipeline(setting.filename);
 }
 
 EXPORTED void setSilentMode(bool sMode){
@@ -77,18 +77,20 @@ EXPORTED void setXMLSchemaLocation(char* file){
 EXPORTED int executePipeline(char* file)
 {
 
+	char dt[100];//stores timestamp as string
+
 	if (file == NULL){
 		cout << "ERR: no file has been provided!" << endl;
 		return -1;
 	}
 
-	if(!_setOutput){
-		_outName = file;
+	if(!setting.outputNameSet){
+		setting.outname = file;
 	}
 
-	(void)! freopen(_logfile.c_str(), "a", stderr); //(void)! suppresses the unused return warning..
+	(void)! freopen(setting.logfile.c_str(), "a", stderr); //(void)! suppresses the unused return warning..
+
 
-	char dt[100];
 	getTimeStamp(dt);
 	cerr << "\n" << dt << " Error log for run with attribute: " << file << endl;
 
@@ -107,7 +109,7 @@ EXPORTED int executePipeline(char* file)
 	xmlTree inputxml;
 
 	roadNetwork data;
-	string outputFile = _outName;
+	string outputFile = setting.outname;
 	data.outputFile = outputFile.substr(0, outputFile.find(".xml"));
     data.outputFile = data.outputFile.substr(0, outputFile.find(".xodr"));
 

src/libfiles/export.h

@@ -33,10 +33,7 @@ struct r_config{
 };
 
 
-std::string _logfile = "log.txt";
-bool _setOutput = false;
-char* _filename;
-std::string _outName = "";
+
 
 
 /**

src/utils/settings.h

@@ -72,8 +72,12 @@ struct settings
     laneChanges laneChange;
     busStops busStop;
 
+    char* filename;
+    std::string outname;
     std::string xmlSchemaLocation; //this has to be set to the xml schema input path
+    std::string logfile = "log.txt"; //stores the location fo the logfile
 
+    bool outputNameSet = false;
     bool silentMode = false; //silent mode disables console outputs
     bool overwriteLog = true;
     int warnings = 0; // counts number of warnings

src/utils/xmlParser.h

@@ -185,7 +185,7 @@ struct xmlTree
         }
         catch (const XMLException &toCatch)
         {
-            cout << "something wrong in xmlreader" << endl;
+            cout << "ERR: in initializing xml Tree" << endl;
             return;
         }
     }