Changeset 22289 for main/trunk/greenstone2/runtime-src/src/oaiservr

Timestamp:

2010-06-23T13:58:54+12:00 (14 years ago)

Author:

kjdon

Message:

ids are now like oai:repos-id:collection:doc

Location:

main/trunk/greenstone2/runtime-src/src/oaiservr

Files:

• listidsaction.cpp (modified) (2 diffs)
• oaiaction.cpp (modified) (2 diffs)
• recordaction.cpp (modified) (1 diff)

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

@@ -210 +210 @@
   text_t           lastModified;
   int              oaiVersion = this->configuration->getOAIVersion();
-
+  text_t repos_id = this->configuration->getRepositoryId();
   get_info(OID, collection, "", metadata, false, protocol, response, logout);
   doc_info = response.docInfo[0];
@@ -217 +217 @@
   // output the record for this document
   text_t oaiLabel = OID;
-  oaiclassifier::toOAI(collection, oaiLabel);
+  oaiclassifier::toOAI(repos_id, collection, oaiLabel);
 
   if(oaiVersion <= 110)

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

@@ -383 +383 @@
     output << "      <datestamp>"  << lastModified << "</datestamp>" << endl;
     
-    // copy the collection name off the front of oaiLabel
-    text_t::const_iterator colon = findchar(oaiLabel.begin(), oaiLabel.end(), ':');
-    text_t collection = substr(oaiLabel.begin(), colon);
-    
+    text_t collection_id;
+    // Find the collection id from oai:repos-id:collection:doc
+    oaiclassifier::getCollectionFromOAIID(oaiLabel, collection_id);
     if(oaiVersion >= 200){
       text_tarray::const_iterator member = memberOf.begin();
@@ -392 +391 @@
 
       // As well as all the subsets that a doc appears in, it is also a member of the 'collection' set
-      output << "      <setSpec>" << collection << "</setSpec>" << endl;
+      output << "      <setSpec>" << collection_id << "</setSpec>" << endl;
       while (member != memEnd) {
     text_t oaiSet = *member;
-    oaiclassifier::toOAI(collection, oaiSet);
+    oaiclassifier::toOAI(collection_id, oaiSet);
     output << "      <setSpec>" << oaiSet << "</setSpec>" << endl;
     ++member;

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

@@ -197 +197 @@
   if (this->errorType != "idDoesNotExist") {
     text_t oaiLabel = OID;
-    oaiclassifier::toOAI(collection, oaiLabel); // Concatenates HASH id to collection, which OAI needs
+    oaiclassifier::toOAI(this->configuration->getRepositoryId(), collection, oaiLabel); // Concatenates HASH id to collection, which OAI needs
     
     // output a record