Changeset 15198 for gsdl/trunk/src/oaiservr/metaformatsaction.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/metaformatsaction.cpp (modified) (2 diffs)

gsdl/trunk/src/oaiservr/metaformatsaction.cpp

@@ -5 +5 @@
 bool metaformatsaction::validateAction(recptproto *protocol, oaiargs &params)
 { 
+  int params_size = params.getSize();
+
+  // 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 != "identifier")
+    {
+      params.erase(param_iterator->first);
+    }
+
+    param_iterator++;
+  }
+
   int numArgs = 1; // the number of expected arguments
   
@@ -15 +30 @@
   // If the total number of params isn't equal to the number of valid
   // args (i.e. we have an arg but it isn't the identifier), throw an error  
-  if((params.getSize() != numArgs)){
+  if((params_size != numArgs)){
     this->errorType = "badArgument";
     return false;