Changeset 8337

Timestamp:

2004-10-14T22:36:44+13:00 (20 years ago)

Author:

cs025

Message:

Fixed problem with a '.' in a collection name; now '.' and ':' are
switched to cope with OAI mapping without inconsistencies and poor
mappings...

Location:

trunk/gsdl/src/oaiservr

Files:

• oaitools.cpp (modified) (3 diffs)
• oaitools.h (modified) (2 diffs)

trunk/gsdl/src/oaiservr/oaitools.cpp

@@ -4 +4 @@
 
 #include "OIDtools.h"
+
+void oaiclassifier::swapColonsAndPeriods(text_t &classifier)
+{
+  for (int i = 1; i <= classifier.size(); i ++) {
+    if (classifier[i] == '.') {
+      classifier[i] = ':';
+    }
+    else if (classifier[i] == ':') {
+      classifier[i] = '.';
+    }
+  }
+
+}
 
 text_t oaiclassifier::getGSDL_OID(const text_t &collection, const text_t& oai_id, 
@@ -35 +48 @@
 void oaiclassifier::toOAI(const text_t &collection, text_t &classifier)
 {
-  for (int i = 1; i <= classifier.size(); i ++) {
-    if (classifier[i] == '.') {
-      classifier[i] = ':';
-    }
-  }
+  oaiclassifier::swapColonsAndPeriods(classifier);
 
   // prepend the collection identifier to the beginning of the
@@ -57 +66 @@
 void oaiclassifier::toGSDL(text_t &collection, text_t &classifier)
 {
-  for (int i = 1; i <= classifier.size(); i ++) {
-    if (classifier[i] == ':') {
-      classifier[i] = '.';
-    }
-  }
+  oaiclassifier::swapColonsAndPeriods(classifier);
 
   // separate out the collection identifier that should be

trunk/gsdl/src/oaiservr/oaitools.h

@@ +1 @@
+
 #ifndef _OAITOOLS_H_
 #define _OAITOOLS_H_
@@ -12 +13 @@
   static void   toOAI(const text_t &collection, text_t &classifier);
   static void   toGSDL(text_t &collection, text_t &classifier);
+ private:
+  static void   swapColonsAndPeriods(text_t &classifier);
 };
 #endif