Changeset 24286

Timestamp:

2011-07-18T17:34:42+12:00 (13 years ago)

Author:

ak19

Message:

John Rose and Luigi had identified a bug in the Resource Identifier URLs served upon a GetRecord action (the same metadata field served by a ListRecords action was not faulty). The URL contained the incorrect name for the collection. As it happens, some previous code committed in commented out form with this file did have the necessary fix, however, as it was embedded in a OAI ID test that need not get executed in this stage of the code, the code crucially correcting the URL's collection name was also commented out as a result. Reinstating only the necessary line that adjusts the URL's collection name.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/recordaction.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/oaiservr/recordaction.cpp

@@ -174 +174 @@
   text_t gsdlId = params["identifier"];
   text_t gsdlCollect;
-
-  /*
-    text_t oai_coll_OID_prefix = "oai:"+this->configuration->getRepositoryId()+":"+collection+":";  
-    if(gsdlId.replace(oai_coll_OID_prefix, "") <= 0) {
-        this->errorType = "idDoesNotExist";
-        // Only throw an error if we're using v2.0. 
-        if (this->configuration->getOAIVersion() >= 200) {
-            return false;
-        }
-    }
-  */
+  
+    // although at this stage, we don't actually need to be testing that the identifier exists
+    // (this method is not meant to throw an idDoesNotExist error), we do however need to be 
+    // working with the correct identifier, so we need to remove any oai_OID_prefix from the 
+    // gsdlId in order to extract the greenstone OID.
+    text_t oai_OID_prefix = "oai:"+this->configuration->getRepositoryId()+":";
+    gsdlId.replace(oai_OID_prefix, "");
   
   // convert record identifier into GSDL format from OAI