cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation SQLTransformer.java

[cziegeler]

cziegeler    2004/03/16 02:33:03

  Modified:    src/blocks/databases/java/org/apache/cocoon/transformation
                        SQLTransformer.java
  Log:
  Make encoding configurable
  
  Revision  Changes    Path
  1.17      +4 -4      
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
  
  Index: SQLTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SQLTransformer.java       6 Mar 2004 02:05:27 -0000       1.16
  +++ SQLTransformer.java       16 Mar 2004 10:33:02 -0000      1.17
  @@ -176,11 +176,8 @@
        * Constructor
        */
       public SQLTransformer() {
  -        // FIXME (CZ) We have to get the correct encoding from
  -        // somewhere else (XML Serializer?)
           this.format = new Properties();
           this.format.put(OutputKeys.METHOD, "text");
  -        this.format.put(OutputKeys.ENCODING, "ISO-8859-1");
           this.format.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
           this.namespaceURI = NAMESPACE;
       }
  @@ -258,6 +255,9 @@
                          String source, Parameters parameters )
       throws ProcessingException, SAXException, IOException {
           super.setup(resolver, objectModel, source, parameters);
  +        // set encoding
  +        this.format.put(OutputKeys.ENCODING, 
parameters.getParameter("xml-encoding", "ISO-8859-1"));
  +
           // setup instance variables
           this.current_query_index = -1;
           this.current_state = SQLTransformer.STATE_OUTSIDE;