Changeset 22285

Timestamp:

2010-06-23T13:52:02+12:00 (14 years ago)

Author:

kjdon

Message:

new toOID takes an extra arg, repos_id, so its generates ids like oai:repos-id:collname:doc-id. old version is still used for set spec ids which remain like demo:CL5. another method to extrac the collection name from a full id

Location:

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

Files:

• oaitools.cpp (modified) (2 diffs)
• oaitools.h (modified) (1 diff)

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

@@ -45 +45 @@
  *  that use ':' instead.
  */
+void oaiclassifier::toOAI(const text_t repos_id, const text_t &collection, text_t &classifier)
+{
+ 
+  text_t tmp = "oai:";
+  tmp.append(repos_id);
+  tmp.append(":");
+  tmp.append(collection);
+  toOAI(tmp, classifier);
+
+}
+
+/**
+ *  Called to convert GS classifier/document identifiers that use
+ *  a '.' to separate levels in the hierarchy into OAI identifiers
+ *  that use ':' instead.
+ */
 void oaiclassifier::toOAI(const text_t &collection, text_t &classifier)
 {
@@ -56 +72 @@
   
   classifier = tmp;
+}
+
+void  oaiclassifier::getCollectionFromOAIID(const text_t oai_id, text_t &collection_id) {
+
+  // id is like oai:repos-id:collection:OID, we just want the collection bit
+
+  text_t::const_iterator begin = oai_id.begin();
+  text_t::const_iterator end = oai_id.end();
+  text_t::const_iterator colon = findchar(begin, end, ':'); // 1
+  if (colon != end) {
+    colon = findchar(colon+1, end, ':'); // 2
+  }
+  text_t::const_iterator third_colon;
+  if (colon !=end) {
+    third_colon = findchar(colon+1, end, ':');
+  }
+  if (third_colon != end) {
+    collection_id = substr(colon+1, third_colon);
+  }
 }
 

main/trunk/greenstone2/runtime-src/src/oaiservr/oaitools.h

@@ -11 +11 @@
                 ostream &logout);
   static void   toOAI(const text_t &collection, text_t &classifier);
+  static void   toOAI(const text_t repos_id, const text_t &collection, text_t &classifier);
   static void   toGSDL(text_t &collection, text_t &classifier);
+  static void  getCollectionFromOAIID(const text_t oai_id, text_t &collection_id);
  private:
   static void   swapColonsAndPeriods(text_t &classifier);