Changeset 6676

Timestamp:

2004-02-02T11:24:52+13:00 (20 years ago)

Author:

nzdl

Message:

moved the separator string constants to GSConstants

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java (modified) (6 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Retrieve.java

@@ -763 +763 @@
     }
 
-    protected final char RELATION_SEP_CHAR = '_';
-    protected final String  SEPARATOR_SEP_STRING = "'";
-    
     protected String getMetadata(String node_id, DBInfo info, 
                  String metadata) {
@@ -771 +768 @@
     String relation = "";
     String separator = ", ";
-    int pos = metadata.indexOf(RELATION_SEP_CHAR);
+    int pos = metadata.indexOf(GSConstants.META_RELATION_SEP);
     if (pos ==-1) {
         // just a plain meta entry eg dc.Title
@@ -782 +779 @@
     if (temp.equals("all")) {
         multiple=true;      
-        pos = metadata.indexOf(RELATION_SEP_CHAR);
+        pos = metadata.indexOf(GSConstants.META_RELATION_SEP);
         if (pos ==-1) {
         temp = "";
@@ -794 +791 @@
     if (temp.equals("parent") || temp.equals("root") || temp.equals( "ancestors")) { // "current" "siblings" "children" "descendents"
         relation = temp;
-        pos = metadata.indexOf(RELATION_SEP_CHAR);
+        pos = metadata.indexOf(GSConstants.META_RELATION_SEP);
         if (pos == -1) {
         temp = "";
@@ -804 +801 @@
     
     // now look for separator info
-    if (temp.startsWith(SEPARATOR_SEP_STRING) && temp.endsWith(SEPARATOR_SEP_STRING)) {
+    if (temp.startsWith(GSConstants.META_SEPARATOR_SEP) && temp.endsWith(GSConstants.META_SEPARATOR_SEP)) {
         separator = temp.substring(1, temp.length()-1);
         
@@ -877 +874 @@
         relation_id = OID.getParent(current_id);
     } 
-    
     return result.toString();
     }