Changeset 16713 for gsdl/trunk/runtime-src/src/oaiservr/listrecsaction.cpp
- Timestamp:
- 2008-08-12T12:15:43+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/oaiservr/listrecsaction.cpp
r16712 r16713 20 20 param_iterator->first != "resumptionToken" && 21 21 param_iterator->first != "metadataPrefix") 22 {23 // We've found an invalid argument24 invalid_argument_supplied = true;25 26 // Delete the invalid argument from the list so it doesn't end up in the <request> tag that is returned27 params.erase(param_iterator->first);28 }29 30 // The metadataPrefix argument is not allowed in OAI v1.131 else if (param_iterator->first == "metadataPrefix" && this->configuration->getOAIVersion() <= 110)32 22 { 33 23 // We've found an invalid argument … … 82 72 // ---------------------------------------------------------------------------- 83 73 84 // OAI v2.0 requires metadataPrefix 85 if (this->configuration->getOAIVersion() > 110) 74 // The metadataPrefix is required 75 text_t metadataPrefix = params["metadataPrefix"]; 76 77 // Check that the metadataPrefix argument exists 78 if (metadataPrefix == "") 86 79 { 87 text_t metadataPrefix = params["metadataPrefix"]; 88 89 // Check that the metadataPrefix argument exists 90 if (metadataPrefix == "") 91 { 92 this->errorType = "badArgument"; 93 return false; 94 } 95 // Check that the metadataPrefix is a format we support 96 if (this->formatNotSupported(metadataPrefix)) 97 { 98 this->errorType = "cannotDisseminateFormat"; 99 return false; 100 } 80 this->errorType = "badArgument"; 81 return false; 82 } 83 // Check that the metadataPrefix is a format we support 84 if (this->formatNotSupported(metadataPrefix)) 85 { 86 this->errorType = "cannotDisseminateFormat"; 87 return false; 101 88 } 102 89
Note:
See TracChangeset
for help on using the changeset viewer.