Merge branch 'main' of https://github.com/ToolFramework/ToolFrameworkCore into main

Author: brichards64

Application/Makefile

@@ -20,7 +20,7 @@ all: lib/libMyTools.so lib/libToolChain.so lib/libStore.so include/Tool.h lib/li
 
 main: src/main.cpp lib/libStore.so lib/libLogging.so lib/libToolChain.so | lib/libMyTools.so  lib/libDataModel.so 
 	@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
-	g++ $(CXXFLAGS) src/main.cpp -o main -I include -L lib -lStore -lMyTools -lToolChain -lDataModel -lLogging  -lpthread $(DataModelInclude) $(MyToolsInclude) $(MyToolsLib) $(DataModelib) 
+	g++ $(CXXFLAGS) src/main.cpp -o main -I include -L lib -lStore -lMyTools -lToolChain -lDataModel -lLogging  -lpthread $(DataModelInclude) $(MyToolsInclude) $(MyToolsLib) $(DataModelLib) 
 
 
 lib/libStore.so: $(Dependencies)/ToolFrameworkCore/src/Store/*

Makefile

@@ -72,13 +72,13 @@ UserTools/Factory/Factory.o: UserTools/Factory/Factory.cpp lib/libStore.so inclu
 	@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
 	cp UserTools/Factory/Factory.h include
 	cp UserTools/Unity.h include
-	-g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelib)
+	-g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelLib)
 
 
 UserTools/%.o: UserTools/%.cpp lib/libStore.so include/Tool.h lib/libLogging.so lib/libDataModel.so | include/Tool.h
 	@echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m"
 	cp $(shell dirname $<)/*.h include
-	-g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelib)
+	-g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelLib)
 
 
 target: remove $(patsubst %.cpp, %.o, $(wildcard UserTools/$(TOOL)/*.cpp))

configfiles/Dummy/ToolChainConfig

@@ -1,19 +1,20 @@
 #ToolChain dynamic setup file
 
 ##### Runtime Paramiters #####
-verbose 9
-error_level 0 # 0= do not exit, 1= exit on unhandeled errors only, 2= exit on unhandeled errors and handeled errors
-attempt_recover 1
+verbose 9     		 # Verbosity level of ToolChain
+error_level 0 		 # 0= do not exit, 1= exit on unhandeled errors only, 2= exit on unhandeled errors and handeled errors
+attempt_recover 1	 # 1= will attempt to finalise if an execute fails, 0= will not
 
 ###### Logging #####
-log_interactive 1 # Interactive=cout;  0=false, 1= true
-log_local 0 # Local = local file log;  0=false, 1= true
-log_local_path ./log
-log_split_files 0 # seperate output and error log files (named x.o and x.e)
+log_interactive 1	# Interactive=cout;  0=false, 1= true
+log_local 0 		# Local = local file log;  0=false, 1= true
+log_local_path ./log	# file to store logs to if local is active
+log_append_time 0       # append seconds since epoch to filename; 0=false, 1= true
+log_split_files 0 	# seperate output and error log files (named x.o and x.e); 0=false, 1= true
 
 ##### Tools To Add #####
-Tools_File configfiles/Dummy/ToolsConfig
+Tools_File configfiles/Dummy/ToolsConfig	# list of tools to run and their config files
 
 ##### Run Type #####
-Inline 1
-Interactive 0
+Inline 1		# number of Execute steps in program, -1 infinite loop that is ended by user
+Interactive 0		# set to 1 if you want to run the code interactively

configfiles/template/ToolChainConfig

@@ -3,13 +3,14 @@
 ##### Runtime Paramiters #####
 verbose 1     		 # Verbosity level of ToolChain
 error_level 2 		 # 0= do not exit, 1= exit on unhandeled errors only, 2= exit on unhandeled errors and handeled errors
-attempt_recover 1 	 # 1= will attempt to finalise if an execute fails
+attempt_recover 1 	 # 1= will attempt to finalise if an execute fails, 0= will not
 
 ###### Logging #####
 log_interactive 1	# Interactive=cout;  0=false, 1= true
 log_local 0 		# Local = local file log;  0=false, 1= true
 log_local_path ./log 	# file to store logs to if local is active
-log_split_files 0 	# seperate output and error log files (named x.o and x.e)
+log_append_time 0 	# append seconds since epoch to filename; 0=false, 1= true
+log_split_files 0 	# seperate output and error log files (named x.o and x.e); 0=false, 1= true
 
 ##### Tools To Add #####
 Tools_File configfiles/ToolsConfig  # list of tools to run and their config files

src/Store/BStore.cpp

@@ -672,22 +672,49 @@ void BStore::Remove(std::string key){
 
 void BStore::JsonParser(std::string input){
 
+  //need to handel arrays and objects properly
+
   int type=0;
   std::string key;
   std::string value;
 
   for(std::string::size_type i = 0; i < input.size(); ++i) {
 
-    if(input[i]=='\"')type++;
-    else if(type==1)key+=input[i];
-    else if(type==3)value+=input[i];
-    else if(type==4){
-      type=0;
-      m_variables[key] << value;
-      key="";
-      value="";
-    }
+    //std::cout<<"i="<<i<<" , "<<input[i]<<" , type="<<type<<std::endl;
+ 
+     //type 0011112233444444550011112233333333001111223366666665500111122337777777555
+     //     { "key" : "value" , "key" : value , "key" : {......} , "key" : [......] }
+
+     // types: 0 - pre key
+     //        1 - key
+     //        2 - postkey
+     //        3 - value
+     //        4 - string value
+     //        5 - post value
+     //        6 - object
+     //        7 - array
+
+     if(input[i]=='\"' && type<5) type++;
+     else if(type==1) key+=input[i];
+     else if(input[i]==':' && type==2) type=3;   
+     else if((input[i]==',' || input[i]=='}') && (type==5 || type==3)){
+       type=0;
+       //std::cout<<"key="<<key<<" , value="<<value<<std::endl;
+       m_variables[key] << value;     
+       key="";
+       value="";
+     }
+     else if(type==3  && !(input[i]==' ' || input[i]=='{' || input[i]=='[')) value+=input[i];
+     else if(type==3  && input[i]=='{'){ value+=input[i]; type=6; }
+     else if(type==6  && input[i]=='}'){ value+=input[i]; type=5; }
+     else if(type==3  && input[i]=='['){ value+=input[i]; type=7; }
+     else if(type==7  && input[i]==']'){ value+=input[i]; type=5; }
+     else if(type==4 || type==6 || type==7) value+=input[i];
   }
+  
+
+
+
 }
 
 

src/Store/Store.cpp

@@ -53,36 +53,46 @@ void Store::Delete(){
 void Store::JsonParser(std::string input){ 
 
   int type=0;
-  std::string key;
-  std::string value;
+  std::string key="";
+  std::string value="";
 
   for(std::string::size_type i = 0; i < input.size(); ++i) {
-    
-     if(input[i]=='\"')type++; 
-      else if(type==1)key+=input[i];
-      else if(type==3)value+=input[i];
-      else if(type==4){
-	type=0;
-	m_variables[key]=value;
-	key="";
-	value="";
-      }
-     
-      
-      /*
-    if(input[i]!=',' &&  input[i]!='{' && input[i]!='}' && input[i]!='\"' && input[i]!=':' && input[i]!=',')pair<<input[i];
-    else if(input[i]==':')pair<<" ";
-    else if(input[i]==',') {
-      std::cout<<" i = "<<i<<" pair = "<<pair<<std::endl;
-    
-      pair>>key>>value;
-      */  
-      //pair.clear();
-
-      //}
+   
+    //std::cout<<"i="<<i<<" , "<<input[i]<<" , type="<<type<<std::endl;
+ 
+     //type 0011112233444444550011112233333333001111223366666665500111122337777777555
+     //     { "key" : "value" , "key" : value , "key" : {......} , "key" : [......] }
+
+     // types: 0 - pre key
+     //        1 - key
+     //        2 - postkey
+     //        3 - value
+     //        4 - string value
+     //        5 - post value
+     //        6 - object
+     //        7 - array
+
+     if(input[i]=='\"' && type<5) type++;
+     else if(type==1) key+=input[i];
+     else if(input[i]==':' && type==2) type=3;   
+     else if((input[i]==',' || input[i]=='}') && (type==5 || type==3)){
+       type=0;
+       //std::cout<<"key="<<key<<" , value="<<value<<std::endl;
+       m_variables[key]=value;
+       key="";
+       value="";
+     }
+     else if(type==3  && !(input[i]==' ' || input[i]=='{' || input[i]=='[')) value+=input[i];
+     else if(type==3  && input[i]=='{'){ value+=input[i]; type=6; }
+     else if(type==6  && input[i]=='}'){ value+=input[i]; type=5; }
+     else if(type==3  && input[i]=='['){ value+=input[i]; type=7; }
+     else if(type==7  && input[i]==']'){ value+=input[i]; type=5; }
+     else if(type==4 || type==6 || type==7) value+=input[i];
   }
-  
+
 }
+  
+
 
 bool Store::Has(std::string key){
 

src/Tool/Tool.h

@@ -18,7 +18,7 @@
 class Tool{
 
  public:
-  
+  Tool(){};
   virtual bool Initialise(std::string configfile,DataModel &data)=0; ///< virtual Initialise function that reads in the assigned config file and optain DataMoodel reference @param configfile Path and name of config file to read in. @param data Reference to DataModel. 
   virtual bool Execute()=0; ///< Virtual Execute function.
   virtual bool Finalise()=0; ///< Virtual Finalise function.

src/ToolChain/ToolChain.cpp

@@ -17,6 +17,14 @@ ToolChain::ToolChain(std::string configfile,  int argc, char* argv[]){
   if(!m_data->vars.Get("log_local",m_log_local)) m_log_local=false;
   if(!m_data->vars.Get("log_split_files",m_log_split_files)) m_log_split_files=false;
   if(!m_data->vars.Get("log_local_path",m_log_local_path)) m_log_local_path="./log";
+  bool log_append_time=false;
+  m_data->vars.Get("log_append_time", log_append_time);
+  if(log_append_time){
+    std::stringstream tmp;
+    tmp<<m_log_local_path<<"."<<time(NULL);
+    m_log_local_path= tmp.str();
+  }
+
 
   if(!m_data->vars.Get("Inline",m_inline)) m_inline=1;
   if(!m_data->vars.Get("Interactive",m_interactive)) m_interactive=false;  
@@ -129,6 +137,10 @@ int ToolChain::Initialise(){
 
 #ifndef DEBUG	
       }      
+      catch(std::exception& e){
+        *m_log<<MsgL(0,m_verbose)<<red<<e.what()<<"\n"<<std::endl;
+        throw;
+      }
       catch(...){
 	*m_log<<MsgL(0,m_verbose)<<red<<"WARNING !!!!! "<<m_toolnames.at(i)<<" Failed to initialise (uncaught error)\n"<<std::endl;
 	result=2;
@@ -204,6 +216,10 @@ int ToolChain::Execute(int repeates){
 #ifndef DEBUG
 	}
 
+	catch(std::exception& e){
+	  *m_log<<MsgL(0,m_verbose)<<red<<e.what()<<"\n"<<std::endl;
+	  throw;
+	}
 	catch(...){
 	  *m_log<<MsgL(0,m_verbose)<<red<<"WARNING !!!!!! "<<m_toolnames.at(i)<<" Failed to execute (uncaught error)\n"<<std::endl;
 
@@ -263,6 +279,10 @@ int ToolChain::Finalise(){
 #ifndef DEBUG      
       }
 
+      catch(std::exception& e){
+	*m_log<<MsgL(0,m_verbose)<<red<<e.what()<<"\n"<<std::endl;
+	throw;
+      }
       catch(...){
 	*m_log<<MsgL(0,m_verbose)<<red<<"WARNING !!!!!!! "<<m_toolnames.at(i)<<" Finalised successfully (uncaught error)\n"<<std::endl;