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

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

@@ -6 +6 @@
 bool listrecsaction::validateAction(recptproto *protocol, oaiargs &params)
 { 
-  int params_size = params.getSize();
-
-  text_t meta    = params["metadataPrefix"];
-  int    numArgs = 1;                // 1st arg (Verb=ListRecords) must be present for us to be here
-
-  if (!abstractlistaction::validateAction(protocol, params, numArgs)) {
-    return false;
-  }
-
-  // metadataPrefix is required - if it's not there, throw an error. Note that the arg isn't 
-  // required (or allowed) if a resumptionToken is given, but as we don't handle resumption
-  // tokens this is sufficient. When we DO handle the tokens, this will have to change.
-  if (meta == "") { 
-    this->errorType = "badArgument";
-    return false;
-  }
-  else {
-    ++numArgs; // If it's there, increase arg count
-  }
-  
-  // The number of valid args should be exactly equal to the number of args actually there.
-  // If not, throw a 'badArgument' error.
-  if (numArgs != params_size) {
-    this->errorType = "badArgument";
-    return false;
-  }
-     
-  if (this->formatNotSupported(meta)) { // Check that the metadataPrefix is supported
-    this->errorType = "cannotDisseminateFormat";
-    this->record_action->setErrorType(this->errorType);
-    return false;
-  }
-
-  return true;
+  return abstractlistaction::validateAction(protocol, params);
 }