Changeset 24412 for main/trunk/greenstone2/runtime-src/src/oaiservr/listrecsaction.cpp

Timestamp:

2011-08-16T17:52:13+12:00 (13 years ago)

Author:

ak19

Message:

Fixed a new failure of the OAI validation test of GS2's OAI server: where list records is given an Until date that is earlier than the earliestDatestamp. Needs to return a noRecordsMatch. It does now. The calculation of the earliestDatestamp is now shifted to the oaiaction.cpp superclass and called by both identifyaction and listrecordsaction for the identify and listrecords OAI queries, since these tasks need to work with earliestDatestamp.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/listrecsaction.cpp (modified) (3 diffs)

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

@@ -156 +156 @@
       this->errorType = "badArgument";
       return false;
-    }
+    }   
   }
 
@@ -178 +178 @@
       return false;
     }
-
+    
     // Check the collection is one that is in the list in the oai.cfg file
     text_tarray &collections = this->configuration->getCollectionsList();
@@ -204 +204 @@
       return false;
     }
-  }
+    
+    // check we're not requested to retrieve records of *this* set/coll 
+    // from an earlier date than *this* set's earliestdatestamp
+    if (params["until"] != "") {
+        text_t eDatestamp = cinfo.earliestDatestamp;
+        time_t raw_time = (time_t)eDatestamp.getint();
+        eDatestamp = this->parseDatestamp(raw_time);
+        
+        // error if request is for records of an earlier date than this coll/set's earliestDatestamp        
+        if(params["until"] < eDatestamp) { 
+            this->errorType = "noRecordsMatch"; // for *this* set/coll of the repository
+            return false;
+        }
+    }
+    
+  } else { // no set (collection) specified
+     if (params ["until"] != "") {  // check we're not requested to retrieve records of an earlier
+                                    // date than the earliestdatestamp across all collections/sets
+        // John Thompson advises not to do lazy evaluation of earliestDatestamp here, because 
+        // reading x number of build.cfg files for x number of collections to work out the 
+        // earliestDatestamp among them is not too expensive an operation, but we do want the OAI 
+        // Server to give accurate results when queried, as that's specified by the OAI protocol.
+        //if(this->mEarliestDatestamp == "") {
+        text_t eDatestamp = this->calcEarliestDatestamp(protocol, params);
+        //}
+        
+        if(params["until"] < eDatestamp) { // request is for records of an earlier date than earliestDatestamp      
+            this->errorType = "noRecordsMatch";
+            return false;
+        }       
+     }
+  } 
 
   // If we've reached here everything must be fine