Changeset 3284

Timestamp:

2002-07-30T09:54:24+12:00 (22 years ago)

Author:

kjdon

Message:

more functionality added along with Test classes

Location:

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

Files:

• GSFile.java (modified) (3 diffs)
• GSFileTest.java (added)
• OID.java (modified) (1 diff)
• OIDTest.java (added)

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

@@ -20 +20 @@
 
 import java.io.File; 
+import org.apache.soap.encoding.soapenc.Base64;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
 
 /**
@@ -39 +46 @@
 
     /** creates a File for the collection directory  */
-    static public File collectionDirFile(String site_home) {
+    static public File collectDirFile(String site_home) {
     return new File(site_home+File.separatorChar+"collect");
     }
+    
     
     /** creates a File for the collection config file */
@@ -66 +74 @@
     return gsdl_home+File.separatorChar+"transform";
     }
+
+    /** returns the base directory name for a collection */  
+    static public String collectionBaseDir(String site_home,
+                       String collection_name) {
+    return site_home+File.separatorChar+"collect"+
+        File.separatorChar+collection_name;
+    }
+
+    /** returns the text path (for doc retrieval) relative to collectionBaseDir */
+    static public String collectionTextPath(String collection_name) {
+    return "index"+File.separatorChar+"text"+File.separatorChar+
+        collection_name;
+    }
+
+    /** returns the index path (for querying) relative to collectionBaseDir */
+    static public String collectionIndexPath(String collection_name,
+                         String index_name) {
+    return "index"+File.separatorChar+index_name+File.separatorChar+
+        collection_name;
+    }
+
+    /** returns an absolute path for an associated file */
+    static public String assocFileAbsolutePath(String site_home,
+                           String collection_name,
+                           String assoc_file_path,
+                           String filename) {
+    return collectionBaseDir(site_home, collection_name)+
+        File.separatorChar+"index"+File.separatorChar+
+        "assoc"+File.separatorChar+assoc_file_path+
+        File.separatorChar+filename;
+    }
+                          
+    static public String base64EncodeFromFile(String in_filename) {
+    byte [] data=null;
+    try {
+        data = readFile(in_filename);
+    } catch (Exception e) {
+        System.out.println("couldn't read the file");
+    }
+    String encodedString = Base64.encode(data);
+    return encodedString;
+
+    }
+    static public boolean base64DecodeToFile(String data, String out_filename) {
+    try {
+        byte[] buffer=Base64.decode(data);
+        writeFile(buffer, out_filename);
         
+    } catch (Exception e) {
+        System.err.println("file opening/closing errors"+e.getMessage());
+        return false;
+    }
+    return true;
+    
+    }
+
+    public static byte[] readFile(String filename) throws IOException {
+    File file = new File(filename);
+    BufferedInputStream bis = new BufferedInputStream(new
+        FileInputStream(file));
+    int bytes = (int) file.length();
+    byte[] buffer = new byte[bytes];
+    int readBytes = bis.read(buffer);
+    bis.close();
+    return buffer;
+    }
+    public static void writeFile(byte [] buffer, String filename) throws IOException {
+    File file = new File(filename);
+    BufferedOutputStream bos = new BufferedOutputStream(new
+        FileOutputStream(file));
+    bos.write(buffer);
+    bos.close();
+    }
 
 }

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

@@ -8 +8 @@
     
     /** returns everything up to the first dot 
-    if no dot, returns OID */
-    public static String getTop(String OID) {
-    int pos = OID.indexOf('.');
+    if no dot, returns oid */
+    public static String getTop(String oid) {
+    int pos = oid.indexOf('.');
     if (pos == -1) {
-        return OID;
+        return oid;
     }
-    return OID.substring(0, pos);
+    return oid.substring(0, pos);
+    
     }
-    /** returns true is OID is top level (ie has no dots) */
-    public static boolean isTop(String OID) {
-    return (OID.indexOf('.')==-1);
+    /** returns true is oid is top level (ie has no dots) 
+     returns false for an empty oid */
+    public static boolean isTop(String oid) {
+    if (oid.equals("")) {
+        return false;
+    }
+    return (oid.indexOf('.')==-1);
     }
     
-    /** returns the parent of OID (everything up to last dot) 
-     returns "" if OID has no parent */
-    public static String getParent(String OID) {
-    int pos = OID.lastIndexOf('.');
+    /** returns the parent of oid (everything up to last dot) 
+     returns "" if oid has no parent */
+    public static String getParent(String oid) {
+    int pos = oid.lastIndexOf('.');
     if (pos == -1) {
         return "";
     }
-    return OID.substring(0, pos);
+    return oid.substring(0, pos);
     }
 
     /** returns the full name - replaces " with parent */
-    public static String translateParent(String OID, String parent) {
+    public static String translateParent(String oid, String parent) {
     // this is the behaviour of the original - should only replace first
     //perhaps?
-    return OID.replaceAll("\"", parent); 
+    return oid.replaceAll("\"", parent); 
     }
     /** does the opposite to translate_parent */
-    public static String shrinkParent(String OID) {
-    int pos = OID.lastIndexOf('.');
-    if (pos==-1) return OID;
-    return "\""+OID.substring(pos);
+    public static String shrinkParent(String oid) {
+    int pos = oid.lastIndexOf('.');
+    if (pos==-1) return oid;
+    return "\""+oid.substring(pos);
     }
-    /** returns true if OID uses .fc, .lc, .pr, .ns, .ps */
-    public static boolean needsTranslating(String OID) {
-    String tail = OID.substring(OID.length()-3);
+    /** returns true if oid uses .fc, .lc, .pr, .ns, .ps */
+    public static boolean needsTranslating(String oid) {
+    String tail = oid.substring(oid.length()-3);
     return (tail.equals(".fc") || tail.equals(".lc") || tail.equals(".pr")
         || tail.equals(".ns") || tail.equals(".ps"));
     }
     /** strips suffix from end */
-    public static String stripSuffix(String OID) {
-    String tail = OID.substring(OID.length()-3);
+    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")) {
-        OID = OID.substring(0, OID.length()-3);
-        tail = OID.substring(OID.length()-3);
+        oid = oid.substring(0, oid.length()-3);
+        tail = oid.substring(oid.length()-3);
     }
-    return OID;
+    return oid;
     }
-    /** returns true if child is a child of parent */
+    /** returns true if child is a child of parent 
+     an oid is not a child of itself */
     public static boolean isChildOf(String parent, String child) {
+    if (parent.equals(child)) {
+        return false;
+    }
     return child.startsWith(parent);
     }