Changeset 31387 for main/trunk/greenstone2/runtime-src/src/colservr/collectserver.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/collectserver.cpp (modified) (3 diffs)

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

@@ -515 +515 @@
     thisfilter->filter (request, response, err, logout);
     if (err != noError) return;
+
     // fill in the metadata for each of the OIDs (if it is requested)
     if (request.filterResultOptions & FRmetadata) {
+
       bool processed = false;
       ResultDocInfo_tarray::iterator resultdoc_here = response.docInfo.begin();
       ResultDocInfo_tarray::iterator resultdoc_end = response.docInfo.end();
       while (resultdoc_here != resultdoc_end) {
+
+    text_t deleted_status = "";
+    bool append_metadata = (request.filterResultOptions & FROAI) ? true : false;
+
     // try each of the sources in turn
     sourcelistclass::iterator source_here = sources.begin();
@@ -526 +532 @@
     while (source_here != source_end) {
       assert ((*source_here).s != NULL);
+
+      // first check for oai metadata from the oai_db, if asked for it (if FROAI is set)
+      if(((*source_here).s != NULL) &&
+         request.filterResultOptions & FROAI &&
+         ((*source_here).s->get_oai_metadata(request.requestParams, request.refParams,
+                         request.getParents, request.fields, 
+                         (*resultdoc_here).OID, deleted_status, (*resultdoc_here).metadata, 
+                         err, logout))) {
+        
+        if (err != noError) return;
+
+        processed = true;
+      }
+
+      // We may or may not have got oai_meta (depends on if FROAI was set).
+      // If we didn't get oai_meta, then deleted_status would still be "".
+      // If we did get oai_meta, and if the deleted_status for the OID was D for deleted entry,
+      // don't bother getting any other metadata, as there will be no entry for that OID in index db.
+      
+      // Note that if we did get oai_meta and OID marked as existing, we're in append_mode:
+      // don't let get_metadata() clear the metadata list, as there's already stuff in there
+      //if(deleted_status == "E") append_metadata = true;
+
       if (((*source_here).s != NULL) &&
+          deleted_status != "D" &&
           ((*source_here).s->get_metadata(request.requestParams, request.refParams,
                           request.getParents, request.fields, 
                           (*resultdoc_here).OID, (*resultdoc_here).metadata, 
-                          err, logout))) {
-        if (err != noError) return;
-        processed = true;
-        break;
+                          err, logout, append_metadata))) {
+        if (err != noError) return; // check for errors again     
+        
+        processed = processed || true; // processed would not have been set yet if not doing FROAI. Set now.
+        // OR-ing isn't necessary, but indicates some consideration of both get oai meta & get meta success
       }
+      
+      if(processed) break;
+
       ++source_here;
     }
@@ -548 +582 @@
       }
     }  
-  
+    
     err = noError;
   }