Changeset 23792 for main/trunk/greenstone3

Timestamp:

2011-03-15T17:07:58+13:00 (13 years ago)

Author:

davidb

Message:

Changes to take advantage of the more efficient Apache Commons string manipulation classes.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• AbstractGS2DocumentRetrieve.java (modified) (4 diffs)
• GS2MGRetrieve.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -44 +44 @@
 import org.apache.log4j.*;
 
+// Apache Commons
+import org.apache.commons.lang3.*;
+
 /** Implements the generic retrieval and classifier services for GS2 
  * collections.
@@ -150 +153 @@
     StringTokenizer st = new StringTokenizer(contains, ";");
     while (st.hasMoreTokens()) {
-        String child_id = st.nextToken().replaceAll("\"", node_id);
+        String child_id = StringUtils.replace(st.nextToken(), "\"", node_id);
         children.add(child_id);
     }
@@ -235 +238 @@
         
         String contains = info.getInfo("contains");
-        contains = contains.replaceAll("\"", parent_id);
+        contains = StringUtils.replace(contains, "\"", parent_id);
         String [] children = contains.split(";");
         for (int i=0;i<children.length;i++) {
@@ -475 +478 @@
         } else {
             String contains = info.getInfo("contains");
-            contains = contains.replaceAll("\"", parent_id);
+            contains = StringUtils.replace(contains, "\"", parent_id);
             String [] children = contains.split(";");
             for (int i=0;i<children.length;i++) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

@@ -33 +33 @@
 
 import org.apache.log4j.*;
+
+// Apache Commons
+import org.apache.commons.lang3.*;
 
 public class GS2MGRetrieve
@@ -134 +137 @@
         if (doc_content!=null) {
             // remove any ctrl-c or ctrl-b
-            doc_content = doc_content.replaceAll ("\u0002|\u0003", "");
+            doc_content = StringUtils.replace(doc_content, "\u0002|\u0003", "");
             // replace _httpimg_ with the correct address
             doc_content = resolveTextMacros (doc_content, doc_id, lang);