Changeset 11277

Timestamp:

2006-02-17T11:35:16+13:00 (18 years ago)

Author:

kjdon

Message:

pp and np are now valid extensions that need translating (previous and next page as if we are reading through the document)

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/OID.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/OID.java

@@ -48 +48 @@
     /** returns true if oid uses .fc, .lc, .pr, .ns, .ps .rt (root) .ss (specified sibling)*/
     public static boolean needsTranslating(String oid) {
+    if (oid.length()<4) return false;
     String tail = oid.substring(oid.length()-3);
     return (tail.equals(".fc") || tail.equals(".lc") || 
         tail.equals(".pr") || tail.equals(".ns") || 
         tail.equals(".ps") || tail.equals(".rt") || 
-        tail.equals(".ss"));
+        tail.equals(".ss") || tail.equals(".np") ||
+        tail.equals(".pp"));
     }
     /** strips suffix from end */
     public static String stripSuffix(String oid) {
     String tail = oid.substring(oid.length()-3);
-    while (tail.equals(".fc") || tail.equals(".lc") || tail.equals(".pr")
-           || tail.equals(".ns") || tail.equals(".ps") || tail.equals(".rt") || tail.equals(".ss")) {
+    while (tail.equals(".fc") || tail.equals(".lc") || 
+           tail.equals(".pr") || tail.equals(".ns") || 
+           tail.equals(".ps") || tail.equals(".ss") || 
+           tail.equals(".np") || tail.equals(".pp") ||
+           tail.equals(".rt") ) {
         if (tail.equals(".ss")) { // have doc.sibnum.ss
         oid = oid.substring(0, oid.length()-3);