cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/transformation SQLTransformer.java
Date Tue, 16 Mar 2004 10:35:33 GMT
cziegeler    2004/03/16 02:35:33

  Modified:    .        status.xml
               src/blocks/databases/java/org/apache/cocoon/transformation
                        SQLTransformer.java
  Log:
  Make encoding configurable
  
  Revision  Changes    Path
  1.282     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.281
  retrieving revision 1.282
  diff -u -r1.281 -r1.282
  --- status.xml	15 Mar 2004 18:11:24 -0000	1.281
  +++ status.xml	16 Mar 2004 10:35:33 -0000	1.282
  @@ -212,6 +212,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="CZ" type="add">
  +     Databases: The xml-encoding for the SQLTransformer is now configurable.
  +   </action>
      <action dev="CZ" type="fix" fixes-bug="27217" due-to="Andreas Hartmann" due-to-email="andreas@apache.org">
        Build System: Apply filtering to patched configurations coming from the different
blocks (loglevel etc.)
      </action>
  
  
  
  1.18      +7 -2      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SQLTransformer.java	16 Mar 2004 10:33:02 -0000	1.17
  +++ SQLTransformer.java	16 Mar 2004 10:35:33 -0000	1.18
  @@ -172,6 +172,9 @@
       /** Encoding we use for CLOB field */
   	protected String clobEncoding;
   	
  +    /** The default encoding for xml */
  +    protected String xmlDefaultEncoding;
  +    
       /**
        * Constructor
        */
  @@ -246,6 +249,8 @@
   
           this.connectAttempts = conf.getChild("connect-attempts").getValueAsInteger(5);
           this.connectWaittime = conf.getChild("connect-waittime").getValueAsInteger(5000);
  +
  +        this.xmlDefaultEncoding = conf.getChild("xml-encoding").getValue("ISO-8859-1");
       }
   
       /**
  @@ -256,7 +261,7 @@
       throws ProcessingException, SAXException, IOException {
           super.setup(resolver, objectModel, source, parameters);
           // set encoding
  -        this.format.put(OutputKeys.ENCODING, parameters.getParameter("xml-encoding", "ISO-8859-1"));
  +        this.format.put(OutputKeys.ENCODING, parameters.getParameter("xml-encoding", this.xmlDefaultEncoding));
   
           // setup instance variables
           this.current_query_index = -1;
  
  
  

Mime
View raw message