Changeset 22300 for other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraCommons.java

Timestamp:

2010-06-24T13:45:34+12:00 (14 years ago)

Author:

ak19

Message:

1. Changes to get Fedora to work with Greenstone3: to let the Greenstone3 Reader Interface work with a Fedora Repository behind the scenes. 2. No longer returns XML Strings formatted for display, but unformatted, since when it's converted to XML DOM on the Greenstone end, new lines introduced due to whitespace interfere with Greenstone 3's default parsing of the XML.

File:

• other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraCommons.java (modified) (1 diff)

other-projects/gs3-webservices-java-client/trunk/src/GS3Fedora/org/greenstone/fedora/services/FedoraCommons.java

@@ -88 +88 @@
     }
     
-    /** Given an Element, this will return its String representation properly 
+    /** Given a DOM node, this will return its String representation properly 
      * indented for display.
-     * @return a string representation of e, formatted for display. 
-     * @param e is the element to be converted to its string representation.
+     * @return a string representation of n, formatted for display. 
+     * @param n is the DOM node to be converted to its string representation.
     */
-    public static String elementToFormattedString(Element e) 
-        throws TransformerException 
+    public static String displayAsString(Node n) 
     {
-        DOMSource domSource = new DOMSource(e);
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-        //transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-        //transformer.setOutputProperty(OutputKeys.ENCODING, "ISO-8859-1");
-        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        try {
+        
+        DOMSource domSource = new DOMSource(n);
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        //transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+        //transformer.setOutputProperty(OutputKeys.ENCODING, "ISO-8859-1");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        
+        StringWriter sw = new StringWriter();
+        transformer.transform(domSource, new StreamResult(sw));
+        return sw.toString();
+        } catch(Exception e) {
+        System.err.println("Couldn't display node as String.");
+        return "";
+        }
+        
+    }
 
-        StringWriter sw = new StringWriter();
-        transformer.transform(domSource, new StreamResult(sw));
-        return sw.toString();
-    }
+    
 }