Bug 826: Added getTreeGroup function to support the three different...

Bug 826: Added getTreeGroup function to support the three different observationlists needed by Navigator 2.

SAS/OTDB/include/OTDB/OTDBconnection.h

@@ -83,6 +83,12 @@ public:
 	// To get a list of all executable OTDB trees available in the database.
 	vector<OTDBtree> getExecutableTrees(classifType aClassification=TCoperational);
 
+	// To get a list of all VIC trees of one of the following groups:
+	// groupType = 1: observations that are scheduled to start the next 'period' minutes
+	//             2: active observations ; period is ignored
+	//             3: observations that were finished during the last 'period' minutes
+	vector<OTDBtree> getTreeGroup(uint32	groupType, uint32	periodInMinutes);
+
 	// Show connection characteristics.
 	ostream& print (ostream& os) const;
 

SAS/OTDB/sql/addKVT_func.sql

@@ -57,7 +57,7 @@ CREATE OR REPLACE FUNCTION addKVT (INT, VARCHAR(150), VARCHAR(150), VARCHAR(20))
 	  SELECT paramid 
 	  INTO	 vParRefID
 	  FROM   PICparamRef
-	  WHERE  PVSSname = translate($2, \'_\', \'.\')
+	  WHERE  PVSSname = $2
 	  LIMIT  1;
 
 	  IF FOUND THEN

SAS/OTDB/sql/addPICparam_func.sql

@@ -61,12 +61,10 @@ CREATE OR REPLACE FUNCTION addPICparam (INT4, VARCHAR(150), INT2)
 	  END IF;
 
 	  -- be sure NODE exists in reference table.
-	  -- PVSSname has format like xxx:aaa_bbb_ccc.ddd 
-	  -- or xxx:aaa_bbb_ccc.ddd.eee
+	  -- name has format like xxx:aaa.bbb.ccc.ddd or xxx:aaa.bbb.ccc.ddd_eee
 	  vNodename := rtrim($2, \'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_\');			-- xxx:aaa_bbb_ccc.
-	  vNodename := rtrim(vNodename, \'.\');				-- xxx:aaa_bbb_ccc
-	  vNodename := translate(vNodename, \'_\', \'.\');	-- xxx:aaa.bbb.ccc
-	  vFullname := translate($2, \'_\', \'.\');			-- xxx:aaa.bbb.ccc.ddd
+	  vNodename := rtrim(vNodename, \'.\');				-- xxx:aaa.bbb.ccc
+	  vFullname := $2;									-- xxx:aaa.bbb.ccc.ddd_eee
 	  IF length(vNodename) > 0 THEN
 	    SELECT paramID 
 	    INTO   vParRefID
@@ -76,7 +74,7 @@ CREATE OR REPLACE FUNCTION addPICparam (INT4, VARCHAR(150), INT2)
 	    IF NOT FOUND THEN
 		  -- node not yet in reference table, add it.
 	      INSERT INTO PICparamRef(PVSSname, par_type)
-	      VALUES (vNodename, vParType);
+	      VALUES (vNodename, 0);	-- type=node
 	    END IF;
 	  END IF;
 

SAS/OTDB/src/OTDBconnection.cc

@@ -222,7 +222,7 @@ vector<TreeState> OTDBconnection::getStateList(
 		return (empty); 
 	}
 
-	LOG_TRACE_FLOW_STR ("OTDB:getTreeList(" << aTreeID << "," 
+	LOG_TRACE_FLOW_STR ("OTDB:getStateList(" << aTreeID << "," 
 										<< toString(isMomID) << ","
 										<< to_simple_string(beginDate) << ","
 										<< to_simple_string(endDate) << ")");
@@ -303,6 +303,53 @@ vector<OTDBtree> OTDBconnection::getExecutableTrees(classifType aClassification)
 	return (empty);
 }
 
+//
+// getTreeGroup(groupType, periodInMinutes)
+//
+// 1 = planned, 2 = active, 3 = finished
+//
+// Note: this function will probably make getExecutableTrees obsolete.
+//
+vector<OTDBtree> OTDBconnection::getTreeGroup(uint32	groupType, uint32 period)
+{
+	if (!itsIsConnected && !connect()) {
+		vector<OTDBtree> 	empty;
+		return (empty); 
+	}
+
+	LOG_TRACE_FLOW_STR ("OTDB:getTreeGroup(" << groupType << "," << period << ")");
+	try {
+		// construct a query that calls a stored procedure.
+		work	xAction(*itsConnection, "getTreeGroup");
+		string	query("SELECT * from getTreeGroup('" +
+						toString(groupType) + "','" +
+						toString(period) + "')");
+
+		// execute query
+		result	res = xAction.exec(query);
+
+		// show how many records found
+		result::size_type	nrRecords = res.size();
+		LOG_DEBUG_STR (nrRecords << " records in treeGroup(" 
+									<< groupType << "," << period << ")");
+	
+		// copy information to output vector
+		vector<OTDBtree>	resultVec;
+		for (result::size_type i = 0; i < nrRecords; ++i) {
+			resultVec.push_back(OTDBtree(res[i]));
+		}
+
+		return (resultVec);
+	}
+	catch (std::exception&	ex) {
+		itsError = string("Exception during retrieval of getTreeGroup:")
+					 + ex.what();
+	}
+
+	vector<OTDBtree> 	empty;
+	return (empty);
+}
+
 //
 // print(ostream&): os&
 //

SAS/OTDB/src/TreeMaintenance.cc

@@ -88,15 +88,16 @@ treeIDType	TreeMaintenance::loadMasterFile (const string&	filename)
 
 	try {
 		// First create a new tree entry.
-		result res = xAction.exec(
-					formatString("SELECT newTree(%d,%d,%d,%d::int2,%d::int2,%d::int2,%d)",
-							itsConn->getAuthToken(),
-							0, 						// original tree
-							0, 						// MomID tree
-							TCexperimental,			// classification
-							TThardware,
-							TSidle,
-							0));					// no campaign
+		string	createTreeCmd(formatString("SELECT newTree(%d,%d,%d,%d::int2,%d::int2,%d::int2,%d)",
+											itsConn->getAuthToken(),
+											0, 						// original tree
+											0, 						// MomID tree
+											TCexperimental,			// classification
+											TThardware,
+											TSidle,
+											0));					// no campaign
+		LOG_TRACE_FLOW(createTreeCmd);
+		result res = xAction.exec(createTreeCmd);
 							
 		// Analyse result.
 		treeIDType		newTreeID;
@@ -112,10 +113,12 @@ treeIDType	TreeMaintenance::loadMasterFile (const string&	filename)
 		paramType		parType;
 		counter = 0;
 		while (inFile >> parType >> parName) {
-			res = xAction.exec("SELECT addPICparam(" + 
-								to_string(newTreeID) + "," +
-								"'" + parName + "'," + 
-								to_string(parType) + "::int2)");
+			string	addParamCmd = "SELECT addPICparam(" + 
+									to_string(newTreeID) + "," +
+									"'" + parName + "'," + 
+									to_string(parType) + "::int2)";
+			LOG_TRACE_FLOW(addParamCmd);
+			res = xAction.exec(addParamCmd);
 			++counter;
 		}