Changeset 31387 for main/trunk/greenstone2/runtime-src/src/colservr/source.cpp

Timestamp:

2017-02-08T18:31:18+13:00 (7 years ago)

Author:

ak19

Message:

Round 1 of commits for getting OAI deletion policy to work with GS2 (server end). The perl code writing out the OAI db and the GS3 server code implementing the deletion policy had already been completed earlier (end 2016).

File:

• main/trunk/greenstone2/runtime-src/src/colservr/source.cpp (modified) (9 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/source.cpp

@@ -33 +33 @@
 {
   db_ptr = NULL;
+  oaidb_ptr = NULL;
   textsearchptr = NULL;
   classname = "source";
@@ -41 +42 @@
   if (db_ptr != NULL) delete db_ptr;
   if (textsearchptr != NULL) delete textsearchptr;
+
+  // http://stackoverflow.com/questions/677620/do-i-need-to-explicitly-call-the-base-virtual-destructor
+  // Answer: "No, destructors are called automatically [by the derived destructor] in the reverse
+  // order of construction. (Base classes last). Do not call base class destructors."
+  // The link also explains why the destructors should be declared as virtual in the header files.
+
+  // now delete the oaidb object pointed to by the oaidb_ptr too
+  if (oaidb_ptr != NULL) delete oaidb_ptr;
+  oaidb_ptr = NULL;
 }
 
@@ -78 +88 @@
 }
 
+text_t sourceclass::getcollectionpath()
+{
+  text_t resolved_filename;
+  
+  if (gsdlhome==dbhome) {
+    // dbhome has defaulted to gsdlhome which we take to means the 
+    // database has been specifically moved out of gsdlhome area.
+    // => it should be whereever collecthome is set to
+    resolved_filename = filename_cat(collecthome, collection);
+  }
+  else {
+    // dbhome is explicitly set to something other than gsdlhome
+    // => use dbhome
+    resolved_filename = filename_cat(dbhome, "collect", collection);
+  }
+
+  return resolved_filename;
+}
+
 text_t sourceclass::resolve_db_filename(const text_t& idx,
                     const text_t& file_ext)
@@ -91 +120 @@
   // are also drawn from one object
 
+  /*
   text_t resolved_filename;
 
@@ -105 +135 @@
     resolved_filename = filename_cat(dbhome, "collect", collection, "index", "text", idx);
   }
-
+  */
+
+  text_t resolved_filename = filename_cat(getcollectionpath(), "index", "text", idx);
   resolved_filename += file_ext;
 
@@ -111 +143 @@
 }
 
-
+text_t sourceclass::resolve_oaidb_filename(const text_t& file_ext)
+{
+  text_t resolved_filename = filename_cat(getcollectionpath(), "etc", "oai-inf");
+
+  resolved_filename += file_ext;
+
+  return resolved_filename;
+}
 
 // init should be called after all the configuration is done but
@@ -172 +211 @@
   }
   
+  oaidb_filename = resolve_oaidb_filename(oaidb_ptr->getfileextension());
+
   return true;
 }
@@ -207 +248 @@
 }
 
+// get_oai_metadata fills out the oai metadata from oaidb if possible
+// if it is not responsible for the given OID then it will return false.
+bool sourceclass::get_oai_metadata (const text_t &requestParams, const text_t &refParams, 
+                bool getParents, const text_tset &fields, 
+                const text_t &OID, text_t &deleted_status, MetadataInfo_tmap &metadata, 
+                comerror_t &err, ostream &logout)
+{
+  outconvertclass text_t2ascii;
+  metadata.erase(metadata.begin(), metadata.end());
+  err = noError;
+
+  //logout << text_t2ascii << "sourceclass::get_oai_meta for OID: " << OID << "\n";   
+
+// ONLY if we're doing any OAI stuff (FROAI will be set then) will we even be in here
+// So next try to open the oai-inf db if it exists for this collection
+  if (!file_exists(oaidb_filename)) { // if the oaidb file doesn't even exist, let's not bother with oaidb
+    
+    logout << text_t2ascii
+       << "warning: collection's oai-inf database \"" << oaidb_filename << "\" does not exist\n\n";    
+    return false;
+    
+  } else { // let's try opening the oaidb file
+    oaidb_ptr->setlogout(&logout);
+    if (!oaidb_ptr->opendatabase (oaidb_filename, DB_READER, 100, false)) {
+      // most likely a system problem (we have already checked that the database exists just above)
+      logout << text_t2ascii
+         << "system problem: open on database \""
+         << oaidb_filename << "\" failed\n\n";
+      err = systemProblem;
+      return false;
+    } // now we've opened the oai-inf db file successfully
+  }
+
+  // get the metadata (deleted status, timestamp, datestamp) for OID, and pushback onto the metadata array
+  infodbclass oai_info;
+  if (!oaidb_ptr->getinfo(OID, oai_info)) { // OID not found in oai_inf db
+    logout << text_t2ascii
+         << "warning: lookup for OID \"" << OID
+         << "\" in etc/oai-inf db failed when getting metadata (in sourceclass source.cpp).\n\n";
+    
+    return false; 
+  } else {
+    //logout << text_t2ascii << "@@@@ getting metadata for OID \"" << OID << "\" from etc/oai-inf db.\n\n";
+    //logout << text_t2ascii << "@@@@ timestamp: " << oai_info["timestamp"] << "\n\n";
+
+    metadata["oaiinf.status"].isRef = false;
+    metadata["oaiinf.status"].values.push_back(oai_info["status"]);
+    metadata["oaiinf.timestamp"].isRef = false;
+    metadata["oaiinf.timestamp"].values.push_back(oai_info["timestamp"]);
+    metadata["oaiinf.datestamp"].isRef = false;
+    metadata["oaiinf.datestamp"].values.push_back(oai_info["datestamp"]);
+  }
+
+   // we're done with oai-inf db
+
+  oaidb_ptr->closedatabase(); // don't leave files open
+
+  return true;
+}
+
 
 // get_metadata fills out the metadata if possible, if it is not responsible
@@ -213 +314 @@
                 bool getParents, const text_tset &fields, 
                 const text_t &OID, MetadataInfo_tmap &metadata, 
-                comerror_t &err, ostream &logout)
+                comerror_t &err, ostream &logout, bool append)
 {
   outconvertclass text_t2ascii;
 
-  metadata.erase(metadata.begin(), metadata.end());
+  if(!append) {
+    metadata.erase(metadata.begin(), metadata.end());
+  }
 
   err = noError;