Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (2 diffs)

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

@@ -20 +20 @@
 
 import java.io.File; 
-import org.apache.soap.encoding.soapenc.Base64;
+//import org.apache.soap.encoding.soapenc.Base64;
+import org.apache.axis.encoding.Base64;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -161 +162 @@
     
     /** text path (for doc retrieval) relative to collectionBaseDir */
-    static public String collectionTextPath(String collection_name) {
+    static public String collectionTextPath(String index_stem) {
     return "index"+File.separatorChar+"text"+File.separatorChar+
-        collection_name;
+        index_stem;
     }
 
     /** index path (for querying) relative to collectionBaseDir */
-    static public String collectionIndexPath(String collection_name,
+    static public String collectionIndexPath(String index_stem,
                          String index_name) {
     return "index"+File.separatorChar+index_name+File.separatorChar+
-        collection_name;
+        index_stem;
     }