Changeset 7962

Timestamp:

2004-08-16T22:43:33+12:00 (20 years ago)

Author:

davidb

Message:

Additional functions added to support using pluginfo.pl and classinfo.pl
on remove server (GLI applet)

Code for Zipping up files altered to explicitly use '/' as this, believe it
or not, is more cross-platform dependant. Even on windows!

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (14 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -676 +676 @@
     }
 
-    static public void extractFromJar(String filename, String dst_dir) 
+    static public void extractFromJar(String filename, String dst_dir, boolean must_be_present) 
     {
     try {
@@ -701 +701 @@
     }
     catch (Exception error) {
-        error.printStackTrace();
+        if (must_be_present) {
+        error.printStackTrace();
+        }
     }
     }
@@ -718 +720 @@
     }
 
-    extractFromJar(jar_zip_fname,dst_dir);
+    extractFromJar(jar_zip_fname,dst_dir,true);
 
     String zip_ofname = dst_dir + jar_zip_fname;
@@ -787 +789 @@
         URL download_url = new URL(download_cgi);
 
-        System.err.println("*** download cgi = '" + download_cgi + "'");
-        System.err.println("*** cgi args = '" + cgi_args + "'");
+        System.err.println("**** download cgi = '" + download_cgi + "'");
+        System.err.println("**** cgi args = '" + cgi_args + "'");
 
         URLConnection dl_connection = download_url.openConnection();
@@ -847 +849 @@
         // open a URL connection to the Servlet 
         URL url = new URL(upload_cgi);
-                
+        System.err.println("**** Uploading to: " + upload_cgi);
+
         // Open a HTTP connection to the URL
         conn = (HttpURLConnection) url.openConnection();
@@ -864 +867 @@
         dos.writeBytes("Content-Disposition: form-data; name=\"c\"" + lineEnd + lineEnd);
         dos.writeBytes(col_name + lineEnd);
+        System.err.println("**** c="+col_name);
 
         dos.writeBytes(twoHyphens + boundary + lineEnd);
         dos.writeBytes("Content-Disposition: form-data; name=\"dir\"" + lineEnd + lineEnd);
-        dos.writeBytes(dir + lineEnd);
-        
+        dos.writeBytes(dir + lineEnd);  
+        System.err.println("**** dir="+dir);
+    
         dos.writeBytes(twoHyphens + boundary + lineEnd);
         dos.writeBytes("Content-Disposition: form-data; name=\"zip\";"
                + " filename=\"" + zip_fname +"\"" + lineEnd);
         dos.writeBytes(lineEnd);
-        
+        System.err.println("**** zip (filename)="+zip_fname);
                 
-        // create a buffer of maximum size
-                    
+        // create a buffer of maximum size                  
         int bytesAvailable = fileInputStream.available();
         int bufferSize = Math.min(bytesAvailable, maxBufferSize);
@@ -882 +886 @@
         
         // read file and write it into form...
-
         int bytesRead = fileInputStream.read(buffer, 0, bufferSize);
         
@@ -930 +933 @@
     }
 
+    static protected String unixStylePath(String path)
+    {
+    String unix_path = path.replace('\\','/');
+    return unix_path;
+    }
+
     static protected void zipFunc (ZipOutputStream zos, String file_path, int prefix_strip) 
     {
@@ -938 +947 @@
         // Strip off col_dir prefix
         String zip_path = file_path.substring(prefix_strip);
-
-        ZipEntry fileEntry = new ZipEntry(zip_path);
+        // Zip files use '/' for directory separator
+        String unix_style_path = unixStylePath(zip_path);
+        ZipEntry fileEntry = new ZipEntry(unix_style_path);
         zos.putNextEntry(fileEntry);
 
@@ -977 +987 @@
             String dir_path = file.getPath();
             String zip_path = dir_path.substring(prefix_strip);
-            // use of "/" here instead of File.separator intentional
-            ZipEntry dirEntry = new ZipEntry(zip_path+"/");
+            // Zip files use '/' for directory separator
+            String unix_style_path 
+                = unixStylePath(zip_path+File.separator);
+            ZipEntry dirEntry = new ZipEntry(unix_style_path);
 
             try {
@@ -1034 +1046 @@
             if (ch.equals(File.separator)) {
                 String dir_path = zip_path.substring(0,i);
-                // use of "/" here instead of File.separation intentional
-                ZipEntry dirEntry = new ZipEntry(dir_path+"/");
+                // Zip files use '/' for directory separator
+                String unix_style_path 
+                = unixStylePath(dir_path+File.separator);
+                ZipEntry dirEntry = new ZipEntry(unix_style_path);
                 zos.putNextEntry(dirEntry);
             }
@@ -1272 +1286 @@
         // URL url = ClassLoader.getSystemResource(filename);
         // URL url = base.getResource("/"+filename);
-        System.err.println("*** looking for resource as stream: " + filename);
+        // System.err.println("*** looking for resource as stream: " + filename);
         InputStream is = base.getResourceAsStream("/"+filename);
 
@@ -1307 +1321 @@
     Document document = null;
     try {
-        System.err.println("file = " + file);
+        Gatherer.println("Parsing XML file: " + file);
         FileInputStream fis   = new FileInputStream(file);
         document = parse(fis,noisey);
@@ -1386 +1400 @@
     }
 
+
+    static public StringBuffer readXMLStream(InputStream input_stream)
+    {
+    StringBuffer xml = new StringBuffer("");
+
+    try {
+        InputStreamReader isr = new InputStreamReader(input_stream, "UTF-8");
+        BufferedReader buffered_in = new BufferedReader(isr);
+        
+        String line = "";
+        boolean xml_content = false;
+        while((line = buffered_in.readLine()) != null) {
+        if(xml_content) {
+            xml.append(line);
+            xml.append("\n");
+        }
+        else if(line.trim().startsWith("<?xml")) {
+            xml_content = true;
+            xml.append(line);
+            xml.append("\n");
+        }
+        }
+        buffered_in = null;
+    }
+    catch (Exception error) {
+        System.err.println("Failed when trying to parse XML stream");
+        error.printStackTrace();
+    }
+
+    return xml;
+    }
+
+
+    static public Document XMLStringToDOM(StringBuffer xml, String form) 
+    {
+    Document document = null;
+
+    // If something has gone horribly wrong then xml will be empty.
+    if(xml.length() > 0) {
+        try {
+        // Then read the xml from the piped input stream.
+        StringReader xml_sr = new StringReader(xml.toString());
+        InputSource source = new InputSource(xml_sr);
+        DOMParser parser = new DOMParser();
+        parser.parse(source);
+        document = parser.getDocument();
+        }
+        catch (Exception error) {
+        System.err.println("Failed when trying to parse XML stream ");
+        error.printStackTrace();
+        }
+    }
+    else {
+        //Gatherer.println("Zero length argument xml detected for: " + form);
+        String[] margs = new String[1];
+        margs[0] = form;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+    }
+
+    return document;
+    }
+
+
+
     /** Method to spread out a line of text so that is is justified to the given width, by attempting to widen white-spacing in a balanced way.
      * @param original The <strong>String</strong> to justify.