Changeset 15198 for gsdl/trunk/src/oaiservr/abstractlistaction.cpp

Timestamp:

2008-04-17T13:52:05+12:00 (16 years ago)

Author:

mdewsnip

Message:

Now each action checks for invalid arguments in the params structure and deletes any that aren't valid, so they don't get into the "<request>" tag in the resulting XML and cause OAI validation errors. By DL Consulting Ltd.

File:

• gsdl/trunk/src/oaiservr/abstractlistaction.cpp (modified) (3 diffs)

gsdl/trunk/src/oaiservr/abstractlistaction.cpp

@@ -6 +6 @@
 bool abstractlistaction::validateAction(recptproto *protocol, oaiargs &params, int &numArgs)
 { 
+  // Remove any parameters that aren't valid for this action
+  text_tmap::const_iterator param_iterator = params.begin();
+  while (param_iterator != params.end())
+  {
+    if (param_iterator->first != "verb" &&
+    param_iterator->first != "from" &&
+    param_iterator->first != "until" &&
+    param_iterator->first != "set" &&
+    param_iterator->first != "resumptionToken" &&
+    param_iterator->first != "metadataPrefix")
+    {
+      params.erase(param_iterator->first);
+    }
+
+    param_iterator++;
+  }
+
   text_t from  = params["from"];
   text_t until = params["until"];
@@ -19 +36 @@
     if(from.size() != 10){
       this->errorType = "badArgument";
-      return false;
+      params.erase("from");
     }
     else{
       if(from[4] != '-' || from[7] != '-'){
     this->errorType = "badArgument";
-    return false;
+    params.erase("from");
       }
     }
@@ -34 +51 @@
     if(until.size() != 10){
       this->errorType = "badArgument";
-      return false;
+      params.erase("until");
     }
     else{
       if(until[4] != '-' || until[7] != '-'){
     this->errorType = "badArgument";
-    return false;
+    params.erase("until");
       }
     }
     ++numArgs; // Increase valid args count
+  }
+
+  if (this->errorType == "badArgument")
+  {
+    return false;
   }