Changeset 16710 for gsdl/trunk/runtime-src/src/oaiservr/listidsaction.cpp

Timestamp:

2008-08-12T11:57:10+12:00 (16 years ago)

Author:

mdewsnip

Message:

Completely tidied up abstractlistaction::validateAction() to handle the resumptionToken argument properly, and to structure the checking code more consistently.

File:

• gsdl/trunk/runtime-src/src/oaiservr/listidsaction.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/oaiservr/listidsaction.cpp

@@ -6 +6 @@
 
 bool listidsaction::validateAction(recptproto *protocol, oaiargs &params)
-{ 
-  int params_size = params.getSize();
-  int numArgs  = 1; // For "verb" arg
-
-  if (!abstractlistaction::validateAction(protocol, params, numArgs)) {
-    return false;
-  }
-
-  // In OAI v1.1 metadataPrefix is not allowed.
-  if (this->configuration->getOAIVersion() <= 110){
-    if(numArgs != params_size){
-      this->errorType = "badArgument";
-      return false;
-    }
-  }
-  else { // In OAI v2.0, it is compulsory
-    text_t metaFormat = params["metadataPrefix"];
-    if (metaFormat == ""){
-      this->errorType = "badArgument";
-      return false;
-    }
-    else { // If it isn't empty, increase the valid args count and compare this to the total num of args
-      if (++numArgs != params_size){
-    this->errorType = "badArgument";
-    return false;
-      }
-    }
-    // Check that the metadataPrefix is a format we support
-    if (this->formatNotSupported(metaFormat)){
-      this->errorType = "cannotDisseminateFormat";
-      return false;
-    }
-  }
-  this->errorType = "";
-  return true;
+{
+  return abstractlistaction::validateAction(protocol, params);
 }