Changeset 24412 for main/trunk/greenstone2/runtime-src/src/oaiservr/identifyaction.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/identifyaction.cpp (modified) (1 diff)

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

@@ -113 +113 @@
     // their build.cfg file at this point by collectserver::configure. The field
     // is declared in comtypes.h)   
-    text_t earliestDatestamp = ""; // do not set default to unix epoch time "1970-01-01" yet
     
-    // Get a list of the OAI-enabled collections available
-    text_tarray& collections = this->configuration->getCollectionsList();
-    if (collections.size() > 0)
-    {       
-        // get the identifier from the params
-        text_t identifier = params["identifier"];
-        text_t oai_OID_prefix = "oai:"+this->configuration->getRepositoryId()+":";
-        identifier.replace(oai_OID_prefix, "");
-
-        // Get the current collection from the identifier
-        text_t collection_name = "";
-        oaiclassifier::toGSDL(collection_name, identifier);
-
-        // Find the starting collection
-        text_tarray::iterator collection_iterator = collections.begin();
-        while (collection_iterator != collections.end())
-        {
-            if (collection_name == "" || collection_name == *collection_iterator)
-            {
-              break;
-            }
-
-            collection_iterator++;
-        }
-        
-        // Now loop through the remaining collections
-        // to work out the earliest datestamp
-        while (collection_iterator != collections.end())
-        {
-            collection_name = (*collection_iterator);
-            
-            ColInfoResponse_t cinfo;
-            comerror_t err; 
-            protocol->get_collectinfo(collection_name, cinfo, err, cerr);
-            if (err == noError) {               
-                text_t eDatestamp = cinfo.earliestDatestamp;
-                time_t raw_time = (time_t)eDatestamp.getint();
-                eDatestamp = this->parseDatestamp(raw_time);
-                
-                if(earliestDatestamp == "") { // first earliestdatestamp we've seen for an oai collection
-                    earliestDatestamp = eDatestamp;
-                } else if(eDatestamp < earliestDatestamp) {
-                    earliestDatestamp = eDatestamp;
-                }               
-            }
-            collection_iterator++;
-            
-        }       
-    }
+    this->calcEarliestDatestamp(protocol, params);  // force the calculation. Sets mEarliestDatestamp member variable
     
-    // if repository's earliestDatestamp is still unset, default to unix epoch time
-    if(earliestDatestamp == "") { 
-        earliestDatestamp = "1970-01-01";
-    }   
-    
-    output << utf8convert << "  <earliestDatestamp>"<< earliestDatestamp <<"</earliestDatestamp>\n";
+    output << utf8convert << "  <earliestDatestamp>"<< this->mEarliestDatestamp <<"</earliestDatestamp>\n";
     output << utf8convert << "  <deletedRecord>no</deletedRecord>\n";
     output << utf8convert << "  <granularity>YYYY-MM-DD</granularity>\n";