Changeset 3941

Timestamp:

2003-03-20T14:13:11+12:00 (21 years ago)

Author:

kjdon

Message:

tidied up a bit

Location:

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

Files:

• GSFile.java (modified) (5 diffs)
• GSHTML.java (modified) (1 diff)
• XMLConverter.java (modified) (11 diffs)
• XMLTransformer.java (modified) (1 diff)
• XSLTUtil.java (modified) (1 diff)

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

@@ -145 +145 @@
      * stylesheets are looked for in the following order
      * site-specific, interface-specific, default
-     * returns null  if the file cannot be found */
+     * returns null  if the file cannot be found 
+     *
+     * this is not so good because sites may be on a different computer */
     static public String stylesheetFile(ConfigVars config, String filename) {
     // try site one first
@@ -223 +225 @@
         data = readFile(in_filename);
     } catch (Exception e) {
-        System.out.println("couldn't read the file");
+        System.err.println("GSFile.base64EncodeFromFile: couldn't read the file");
     }
     String encodedString = Base64.encode(data);
@@ -237 +239 @@
        
     } catch (Exception e) {
-        System.err.println("file opening/closing errors"+e.getMessage());
+        System.err.println("GSFile.base64DecodeToFile: file opening/closing errors"+e.getMessage());
         return false;
     }
@@ -299 +301 @@
     for(int i = 0; i < input.length; i++) {
         File output = new File(destination, input[i].getName());
-        if(input[i].isDirectory()) {
+        if (input[i].isDirectory()) {
         moveDirectory(input[i], output);
         } else {
-        System.out.println("moving directory manually");
         // Copy the file
         try {
@@ -317 +318 @@
             input[i].delete();
         } catch (Exception e) {
-            System.out.println("GSFile.moveDirectory: exception: "+e.getMessage());
+            System.err.println("GSFile.moveDirectory: exception: "+e.getMessage());
             return false;
         }

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

@@ -37 +37 @@
         String entity = input.substring(i, j);
         i=j;
-        System.out.println("entity="+entity);
         if (entity.equals("amp")) {
             filtered.append('&');

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

@@ -25 +25 @@
 import org.w3c.dom.NamedNodeMap;
 import org.xml.sax.InputSource;
-//import javax.xml.parsers.*;
-//import org.apache.xerces.dom.TextImpl;
 import org.apache.xerces.parsers.DOMParser;
 import org.apache.xerces.dom.DocumentImpl; // for new Documents
@@ -40 +38 @@
  * parses XML Strings into Documents, converts Nodes to Strings
  * different parsers have different behaviour - can experiment in here
+ * now we only use xerces
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
@@ -46 +45 @@
  */
 public class XMLConverter {
-
-    /** JAXP parser factory */
-    //protected DocumentBuilderFactory doc_build_fact_=null;
-    /** JAXP parser */
-    //  protected DocumentBuilder doc_builder_=null;
 
     /** xerces parser */
@@ -61 +55 @@
     public XMLConverter() {
     try {
-        //doc_build_fact_ = DocumentBuilderFactory.newInstance();
-        
-        //doc_builder_ = doc_build_fact_.newDocumentBuilder(); 
         parser_ = new DOMParser();
     } catch (Exception e) {
-        System.out.println("XMLConverter:exception "+e.getMessage());
+        System.err.println("XMLConverter:exception "+e.getMessage());
     }
     }
@@ -77 +68 @@
         InputSource xml_source = new InputSource(reader);
         
-        // Document doc = doc_builder_.parse(xml_source);
         parser_.parse(xml_source);
         Document doc = parser_.getDocument();
@@ -83 +73 @@
 
     } catch (Exception e) {
-        System.out.println("XMLConverter.getDOM(String): exception "+e.getMessage());
+        System.err.println("XMLConverter.getDOM(String): exception "+e.getMessage());
     }
     return null;
@@ -95 +85 @@
         InputSource xml_source = new InputSource(reader);
         
-        //Document doc = doc_builder_.parse(xml_source);
         parser_.parse(xml_source);
         Document doc = parser_.getDocument();
@@ -102 +91 @@
 
     } catch (Exception e) {
-        System.out.println("XMLConverter.getDOM(File): exception "+e.getMessage());
+        System.err.println("XMLConverter.getDOM(File): exception "+e.getMessage());
     }
     return null;
@@ -109 +98 @@
     /** creates a new empty DOM Document */
     public Document newDOM() {
-    // try with xerces
-    Document doc = new DocumentImpl(); //doc_builder_.newDocument();
+    Document doc = new DocumentImpl(); 
     return doc;
     }
@@ -205 +193 @@
         }
         else {
-        System.err.println("Warning: Unhandled processing instruction " + nodeName);
+        System.err.println("XMLConverter.getString(): Warning: Unhandled processing instruction " + nodeName);
         }
     }
@@ -211 +199 @@
     // A type of node that is not handled yet
     else {
-        System.err.println("Warning: Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
+        System.err.println("XMLConverter.getString(): Warning: Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
     }
 

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

@@ -67 +67 @@
 
     } catch (Exception e) {
-        System.out.println("XMLTransformer() exception "+e.getMessage());
+        System.err.println("XMLTransformer() exception "+e.getMessage());
     }
     }

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

@@ -17 +17 @@
     }
     catch (Exception e){
-        System.out.println("unsupported encoding");
+        System.err.println("XSLTUtil.toUTF8: unsupported encoding");
         return orig.getBytes();
     }