Changeset 31387 for main/trunk/greenstone2/runtime-src/src/oaiservr/recordaction.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/oaiservr/recordaction.cpp (modified) (5 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/recordaction.cpp

@@ -148 +148 @@
   // Check a document with the specified identifier exists
   text_tset metadata;
-  if (!get_info(identifier, collection, "", metadata, false, protocol, this->gsdlResponse, *logout))
+  if (!get_oai_info(identifier, collection, "", metadata, false, protocol, this->gsdlResponse, *logout))
   {
     this->errorType = "idDoesNotExist";
@@ -200 +200 @@
   
   // get the document information
-  if (!get_info(OID, collection, "", metadata, false, protocol, this->gsdlResponse, logout)) {
+  if (!get_oai_info(OID, collection, "", metadata, false, protocol, this->gsdlResponse, logout)) {
 
     this->errorType = "idDoesNotExist";
@@ -208 +208 @@
       return false;
     }
+  }
+  else {    
+    this->errorType = "";
   }
 
@@ -232 +235 @@
   ResultDocInfo_t doc_info = this->gsdlResponse.docInfo[0];
   text_t lastModified = "";
+  text_t deleted_status = "";
 
   // Fills lastModified with the date from the document in doc_info, in the format YYYY-MM-DD
   this->getLastModifiedDate(doc_info, lastModified);
+  this->getMeta(doc_info, "oaiinf.status", deleted_status);
 
   // If the ID exists, output record for oai response (OAI v1.1)
@@ -246 +251 @@
     
     // output header part of oai response
-    this->output_record_header(output, oaiLabel, lastModified, 
+    this->output_record_header(output, oaiLabel, lastModified, deleted_status,
                    doc_info.metadata["memberof"].values, oaiVersion);
     
-    if (this->errorType != "cannotDisseminateFormat"){
+    // only output <metadata /> section if record is not marked as deleted
+    if (this->errorType != "cannotDisseminateFormat" && deleted_status != "D") {
       if (this->formatMap[metadataPrefix].get_class()->output_metadata(output, collection, doc_info)) {
     //  output 'about' part of oai response - we probably won't ever use this