Changeset 31394 for main/trunk/greenstone2/runtime-src

Timestamp:

2017-02-09T14:02:40+13:00 (7 years ago)

Author:

ak19

Message:

Further commit to do with implementing GS2 server side of OAI deletion policy: 1. Forgot to svn add new files! 2. browsefilter code does not need to get the oai metadata, removed this duplicate code, as that part is handled in source.cpp's get_oai_metadata, which is the stage where the oai metadata is actually required.

Location:

main/trunk/greenstone2/runtime-src/src/colservr

Files:

• browsefilter.cpp (modified) (2 diffs)
• colservertools.cpp (added)
• colservertools.h (added)

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

@@ -382 +382 @@
          << "warning: lookup for node \"" << resultdoc.OID
          << "\" in etc/oai-inf db failed for browsefilter.\n\n";
-    } else {
+    }
+    // We don't need to get the oai metadata from oai-inf.db at this stage. That will be
+    // handled by a separate metadata request. See collectserver::filter() and source.cpp's get_oai_metadata().
+    /*
+    else {
       //logout << text_t2ascii << "@@@@ found node \"" << resultdoc.OID << "\" in etc/oai-inf db.\n\n";
       
@@ -392 +396 @@
       resultdoc.metadata["oaiinf.datestamp"].values.push_back(oai_info["datestamp"]);
     }
+    */
     
     response.docInfo.push_back(resultdoc);