Changeset 15380

Timestamp:

2008-05-09T15:12:02+12:00 (16 years ago)

Author:

mdewsnip

Message:

Three fixes to the resumption token code to prevent crashes when specifying a set that isn't at collection-level. By DL Consulting Ltd.

Location:

gsdl/trunk/src/oaiservr

Files:

• abstractlistaction.cpp (modified) (2 diffs)
• resumptiontoken.cpp (modified) (1 diff)

gsdl/trunk/src/oaiservr/abstractlistaction.cpp

@@ -404 +404 @@
       }
     }
+
+    // We need to subtract one from the startPos value to turn it into an index value
+    startPos--;
   }
   
@@ -440 +443 @@
 
     if (this->outputDocs == this->configuration->resumeAfter()) {
-      //      this->replyToken = new ResumptionToken(collection, params["set"], "");
-      this->replyToken = resumptionToken;
+      this->replyToken = new ResumptionToken(collection, params["set"], "");
       this->replyToken->setPosition(classifier, c+2);      
-    }
-  }
-}
-
-
-
-
+      break;
+    }
+  }
+}
+
+
+
+

gsdl/trunk/src/oaiservr/resumptiontoken.cpp

@@ -56 +56 @@
 
   if (second != here) {
+    // get past the '.'
+    ++second;
     this->browseNode = substr(second, here);
   }