From 37ce7617170db97c1ad6bc736a331e7fedf56a8e Mon Sep 17 00:00:00 2001
From: caballero <caballero>
Date: Mon, 20 Apr 2009 11:29:34 +0000
Subject: [PATCH] Added functionality for non loaded nodes

---
 src2/creaImageIOSQLiteTreeHandler.cpp        | 35 +++++++++++++++++++-
 src2/creaImageIOSQLiteTreeHandler.h          |  8 ++++-
 src2/creaImageIOTimestampDatabaseHandler.cpp | 14 ++++++--
 src2/creaImageIOTreeHandler.h                |  7 ++++
 src2/creaImageIOTreeHandlerImageAdder.cpp    |  6 +++-
 5 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/src2/creaImageIOSQLiteTreeHandler.cpp b/src2/creaImageIOSQLiteTreeHandler.cpp
index 6af107d..0a953fa 100644
--- a/src2/creaImageIOSQLiteTreeHandler.cpp
+++ b/src2/creaImageIOSQLiteTreeHandler.cpp
@@ -975,7 +975,7 @@ namespace creaImageIO
 	query<<"DELETE FROM "<<levelDescriptor<<" WHERE "<<key<<"='"<<value<<"';";
  
     UPDATEDB(query.str());
-	GimmickMessage(1," Deleting: Query: "<<query.str()<<std::endl);
+	GimmickDebugMessage(2," Deleting: Query: "<<query.str()<<std::endl);
   }
 
 
@@ -1051,6 +1051,39 @@ namespace creaImageIO
     return nb; 
   }
 
+  //===================================================================== 
+  void SQLiteTreeHandler::GetTopLevelNodeId(const std::string& searchParam, const std::string& searchValue, std::string& parent_id) 
+  {
+	  int level=GetTree().GetNumberOfLevels()-1;
+	  std::string sp=searchParam.c_str();
+	  std::string sv=searchValue.c_str();
+
+	  while(level>1)
+	  {
+		std::stringstream out;
+		std::stringstream results;
+		out<<"SELECT PARENT_ID FROM "<<GetTree().GetLevelDescriptor(level).GetName();
+		out<<" WHERE "<<sp<<"='"<<sv<<"'";	
+		CppSQLite3Query q;
+		QUERYDB(out.str(),q);
+		
+		
+		while (!q.eof())
+		{
+			for (int fld = 0; fld < q.numFields(); fld++)
+			{
+				results<<q.getStringField(fld);
+			}
+			q.nextRow();
+		}
+		level=level-1;
+		sp="ID";
+		sv=results.str();
+	  }
+	  parent_id=sv;
+
+  }
+
   /*
   //=====================================================================
   bool SQLiteTreeHandler::DBInsert(Node* alien_node,
diff --git a/src2/creaImageIOSQLiteTreeHandler.h b/src2/creaImageIOSQLiteTreeHandler.h
index 1c35aac..1284e16 100644
--- a/src2/creaImageIOSQLiteTreeHandler.h
+++ b/src2/creaImageIOSQLiteTreeHandler.h
@@ -94,7 +94,13 @@ namespace creaImageIO
     // WITHOUT altering the source, e.g. the database
     virtual void UnLoad(tree::Node* n);
     ///====================================================================
-
+	
+	//====================================================================
+    /// Returns the top level node id for the given search param and search value
+    virtual void GetTopLevelNodeId(const std::string& searchParam, 
+											const std::string& searchValue, 
+											std::string& parent_id);
+    ///====================================================================
 
     //====================================================================
     // WRITE METHODS : WORK ONLY IN WRITE MODE
diff --git a/src2/creaImageIOTimestampDatabaseHandler.cpp b/src2/creaImageIOTimestampDatabaseHandler.cpp
index 0e1176e..9ee54b3 100644
--- a/src2/creaImageIOTimestampDatabaseHandler.cpp
+++ b/src2/creaImageIOTimestampDatabaseHandler.cpp
@@ -168,6 +168,7 @@ namespace creaImageIO
 	    command += ",\nPATH text";
 		command += ",\nLastModified datetext";
 		command += ",\nLastRead datetext";
+		command += ",\nTopLevelNodeId text";
 		command += ",\nconstraint FK_PARENT foreign key (PARENT_ID) references ";
 		command += "FILES";
 		command += "(ID) on delete restrict on update restrict";
@@ -303,14 +304,19 @@ namespace creaImageIO
 											const std::string& searchParam,
 											const std::string& searchValue)
   {
+	std::string av=attValue.c_str();
+	std::string sv=searchValue.c_str();
+	CleanName(av);
+	CleanName(sv);
+
 	std::string sql = "UPDATE FILES SET ";
     sql += attName;
     sql += " = '";
-    sql += attValue;
+    sql += av;
     sql += "' WHERE ";
 	sql += searchParam;
 	sql += " = '";
-    sql += searchValue;
+    sql += sv;
 	sql += "'";
     UPDATETIMESTAMPDB(sql);
   }
@@ -332,6 +338,10 @@ namespace creaImageIO
 	  {
 		  RemoveFile(searchAtt,node->GetAttribute("FullFileName"));
 	  }
+	  else
+	  {
+		  DBRemove("TopLevelNodeId",node->GetAttribute("ID"));
+	  }
 
 
   }
diff --git a/src2/creaImageIOTreeHandler.h b/src2/creaImageIOTreeHandler.h
index 5a7cecd..9b7c4db 100644
--- a/src2/creaImageIOTreeHandler.h
+++ b/src2/creaImageIOTreeHandler.h
@@ -105,6 +105,13 @@ namespace creaImageIO
     virtual void UnLoad(tree::Node* n) { return; }
     //====================================================================
 
+	//====================================================================
+    /// Returns the top level node id for the given search param and search value
+    virtual void GetTopLevelNodeId(const std::string& searchParam, 
+											const std::string& searchValue, 
+											std::string& parent_id){ return; }
+    ///====================================================================
+
 
     //====================================================================
     // WRITE METHODS : WORK ONLY IN WRITE MODE
diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index f5424b6..f68fa77 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -50,7 +50,7 @@ namespace creaImageIO
     std::vector<std::string>::const_iterator i;
     for (i=filenames.begin();i!=filenames.end();++i)
       {
-		  
+	mTimestampHandler->AddFile((*i), fs::last_write_time(*i), time(0));
 	mProgress.IncNumberScannedFiles();
 	if (IsHandledFile(*i)) 
 	  {
@@ -114,6 +114,7 @@ namespace creaImageIO
 	  }
 	else 
 	  {
+		std::string parent_id;
 		bool valid=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0));
 		if(valid)
 		{
@@ -122,6 +123,8 @@ namespace creaImageIO
 			{
 			mProgress.IncNumberHandledFiles();
 			AddFile( itr->string() );
+			mTreeHandler->GetTopLevelNodeId("FullFileName",itr->string(),parent_id);
+			mTimestampHandler->SetAttribute("TopLevelNodeId",parent_id,"PATH",itr->string());
 			}
 			mProgressSignal(mProgress);
 			if (mProgress.GetStop()) 
@@ -130,6 +133,7 @@ namespace creaImageIO
 			break;
 			}
 		}
+		mTimestampHandler->SetAttribute("TopLevelNodeId",parent_id,"PATH",dirpath);
 	  }
       }
 	
-- 
2.46.1