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

gsdl/trunk/src/oaiservr/recordaction.cpp

@@ -29 +29 @@
 
 bool recordaction::validateAction(recptproto *protocol, oaiargs &params)
-{ text_t meta = params["metadataPrefix"];
+{
+  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" &&
+    param_iterator->first != "metadataPrefix")
+    {
+      params.erase(param_iterator->first);
+    }
+
+    param_iterator++;
+  }
+
+  text_t meta = params["metadataPrefix"];
   text_t gsdlId = params["identifier"];
   text_t gsdlCollect;
@@ -37 +54 @@
   // The identifier and metadataPrefix args MUST be supplied, and are the only 
   // args allowed (excluding verb arg). If we don't have them, throw an error.
-  if(gsdlId == "" || meta == "" || params.getSize() != 3){
+  if(gsdlId == "" || meta == "" || params_size != 3){
     this->errorType = "badArgument";
     return false;