Changeset 16711 for gsdl/trunk/runtime-src/src

Timestamp:

2008-08-12T12:04:01+12:00 (16 years ago)

Author:

mdewsnip

Message:

Tidied up the validateAction() function to be consistently structured.

File:

• gsdl/trunk/runtime-src/src/oaiservr/identifyaction.cpp (modified) (2 diffs)

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

@@ -3 +3 @@
 bool identifyaction::validateAction(recptproto *protocol, oaiargs &params)
 { 
-  int params_size = params.getSize();
-
-  // Remove any parameters that aren't valid for this action
+  // ----------------------------------------------------------------------------
+  //  1. Check for invalid arguments
+  // ----------------------------------------------------------------------------
+  bool invalid_argument_supplied = false;
   text_tmap::const_iterator param_iterator = params.begin();
   while (param_iterator != params.end())
   {
+    // Check for arguments that aren't valid for this action
     if (param_iterator->first != "verb")
     {
+      // We've found an invalid argument
+      invalid_argument_supplied = true;
+
+      // Delete the invalid argument from the list so it doesn't end up in the <request> tag that is returned
       params.erase(param_iterator->first);
     }
@@ -16 +22 @@
     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_size != 1){
+
+  // If we found an invalid argument it's an error, so don't go any further 
+  if (invalid_argument_supplied)
+  {
     this->errorType = "badArgument";
     return false;
   }
-  
+
+  // ----------------------------------------------------------------------------
+  //  2. Handle any exclusive arguments
+  // ----------------------------------------------------------------------------
+
+  // None!
+
+  // ----------------------------------------------------------------------------
+  //  3. Handle any required arguments
+  // ----------------------------------------------------------------------------
+
+  // None!
+
+  // ----------------------------------------------------------------------------
+  // 4. Check any remaining arguments
+  // ----------------------------------------------------------------------------
+
+  // None!
+
+  // If we've reached here everything must be fine
+  this->errorType = "";
   return true;
 }