Changeset 15198 for gsdl/trunk/src/oaiservr/identityaction.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/identityaction.cpp (modified) (1 diff)

gsdl/trunk/src/oaiservr/identityaction.cpp

@@ -4 +4 @@
 bool identityaction::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")
+    {
+      params.erase(param_iterator->first);
+    }
+
+    param_iterator++;
+  }
+  
   //"Verb=Identify" should be the only parameter - if there are others, throw an error.
   // Don't need to check that the param we have is "Verb=Identify", as it has to be to get to here.
-  
-  if(params.getSize() != 1){
+  if(params_size != 1){
     this->errorType = "badArgument";
     return false;