Changeset 20626

Timestamp:

2009-09-18T11:14:42+12:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed some inconsistencies in the resumption tokens used in the ListSets service, and removed the collection build date because this request is not collection-specific.

File:

• gsdl/trunk/runtime-src/src/oaiservr/listsetsaction.cpp (modified) (8 diffs)

gsdl/trunk/runtime-src/src/oaiservr/listsetsaction.cpp

@@ -89 +89 @@
   this->setsOutput = 0;
 
-  text_t collection = "";
+  text_t position = "";
 
   // Process the resumptionToken if there is one
@@ -95 +95 @@
   {
     ResumptionToken resumption_token(params["resumptionToken"]);
-    collection = resumption_token.getSet();
+    position = resumption_token.getPosition();
   }
 
@@ -105 +105 @@
   }
 
+  // Get the current collection from the position value
+  text_t collection_name = "";
+  oaiclassifier::toGSDL(collection_name, position);
+
   // Find the starting collection
   text_tarray::iterator collection_iterator = collections.begin();
   while (collection_iterator != collections.end())
   {
-    if (collection == "" || collection == *collection_iterator)
+    if (collection_name == "" || collection_name == *collection_iterator)
     {
       break;
@@ -120 +124 @@
   while (collection_iterator != collections.end())
   {
-    collection = (*collection_iterator);
+    collection_name = (*collection_iterator);
 
     // If we've output the desired number of records return a resumptionToken and we're done
     if (this->setsOutput == this->configuration->resumeAfter())
     {
-      // Get the buildDate from the build.cfg file
-      ColInfoResponse_t cinfo;
-      comerror_t err;
-      protocol->get_collectinfo(collection, cinfo, err, cerr);
-
-      ResumptionToken resumption_token(cinfo.buildDate, collection, "", "", "", "");
+      ResumptionToken resumption_token("", "", "", "", "", collection_name);
 
       // Don't add any whitespace around the resumption token as it can confuse harvesters/validators
@@ -138 +137 @@
 
     // If output_content_for_col() returns false a resumption token has been output, so it's time to stop
-    if (output_content_for_col(output, protocol, params, collection) == false)
+    if (output_content_for_col(output, protocol, params, collection_name) == false)
     {
       return true;
@@ -173 +172 @@
     while (set_iterator != sets_response.docInfo.end())
     {
-      if (position == "" || position == (*set_iterator).OID)
+      if (position == "" || position == (collection + ":" + (*set_iterator).OID))
       {
     break;
@@ -183 +182 @@
 
   // Output the collection as a set
-  if (position == "")
+  if (position == "" || position == collection)
   {
     output << "  <set>" << endl;
@@ -209 +208 @@
       if (this->setsOutput == this->configuration->resumeAfter())
       {
-    // Get the buildDate from the build.cfg file
-    ColInfoResponse_t cinfo;
-    comerror_t err;
-    protocol->get_collectinfo(collection, cinfo, err, cerr);
-
-    ResumptionToken resumption_token(cinfo.buildDate, collection, "", "", "", set);
+    ResumptionToken resumption_token("", "", "", "", "", collection + ":" + set);
 
     // Don't add any whitespace around the resumption token as it can confuse harvesters/validators