Changeset 16713

Timestamp:

2008-08-12T12:15:43+12:00 (16 years ago)

Author:

mdewsnip

Message:

The ListRecords action requires the metadataPrefix argument for both versions of OAI.

File:

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

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

@@ -20 +20 @@
     param_iterator->first != "resumptionToken" &&
     param_iterator->first != "metadataPrefix")
-    {
-      // 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);
-    }
-
-    // The metadataPrefix argument is not allowed in OAI v1.1
-    else if (param_iterator->first == "metadataPrefix" && this->configuration->getOAIVersion() <= 110)
     {
       // We've found an invalid argument
@@ -82 +72 @@
   // ----------------------------------------------------------------------------
 
-  // OAI v2.0 requires metadataPrefix
-  if (this->configuration->getOAIVersion() > 110)
+  // The metadataPrefix is required
+  text_t metadataPrefix = params["metadataPrefix"];
+
+  // Check that the metadataPrefix argument exists
+  if (metadataPrefix == "")
   {
-    text_t metadataPrefix = params["metadataPrefix"];
-
-    // Check that the metadataPrefix argument exists
-    if (metadataPrefix == "")
-    {
-      this->errorType = "badArgument";
-      return false;
-    }
-    // Check that the metadataPrefix is a format we support
-    if (this->formatNotSupported(metadataPrefix))
-    {
-      this->errorType = "cannotDisseminateFormat";
-      return false;
-    }
+    this->errorType = "badArgument";
+    return false;
+  }
+  // Check that the metadataPrefix is a format we support
+  if (this->formatNotSupported(metadataPrefix))
+  {
+    this->errorType = "cannotDisseminateFormat";
+    return false;
   }