[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester DigesterConversionUnmarshaller.java,1.1,1.2 OutputDocument.java,1.1,1.2

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv5825/src/com/babeldoc/conversion/flatfile/digester

Modified Files:
	DigesterConversionUnmarshaller.java OutputDocument.java 
Log Message:
conversion code now can alter the output xml document

Index: DigesterConversionUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/DigesterConversionUnmarshaller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DigesterConversionUnmarshaller.java	19 Jul 2003 13:16:47 -0000	1.1
--- DigesterConversionUnmarshaller.java	7 Aug 2003 21:09:02 -0000	1.2
***************
*** 71,74 ****
--- 71,75 ----
  
  import com.babeldoc.core.I18n;
+ import com.babeldoc.core.ResourceLoader;
  
  import org.apache.commons.digester.Digester;
***************
*** 94,98 ****
   * @version 1.0
   */
! public class DigesterConversionUnmarshaller implements ConversionUnmarshaller {
    private Conversion conversion;
    private FieldData[] fields = null;
--- 95,101 ----
   * @version 1.0
   */
! public class DigesterConversionUnmarshaller
!     implements ConversionUnmarshaller {
! 
    private Conversion conversion;
    private FieldData[] fields = null;
***************
*** 100,103 ****
--- 103,107 ----
    public static final String DEFAULT_CSV_SEPARATOR = ",";
    public static final String DEFAULT_LINE_SEPARATOR = "\n";
+   public static final String DEFAULT_ENCODING = "UTF-8";
  
    /**
***************
*** 131,135 ****
    public DigesterConversionUnmarshaller(String source)
        throws IOException {
!     this(com.babeldoc.core.ResourceLoader.getResourceStream(source));
    }
  
--- 135,139 ----
    public DigesterConversionUnmarshaller(String source)
        throws IOException {
!     this(ResourceLoader.getResourceStream(source));
    }
  
***************
*** 307,310 ****
--- 311,327 ----
  
    /**
+    * Get the encoding string
+    *
+    * @return
+    */
+   public String getEncoding() {
+     if(conversion.getHeader().getOutputDocument().getEncoding()!=null) {
+       return conversion.getHeader().getOutputDocument().getEncoding();
+     } else {
+       return DEFAULT_ENCODING;
+     }
+   }
+ 
+   /**
     * Test this beast
     *
***************
*** 422,425 ****
--- 439,444 ----
      digester.addCallMethod("conversion/header/output-document/row-element",
        "setRowElement", 0);
+     digester.addCallMethod("conversion/header/output-document/encoding",
+       "setEncoding", 0);
  
      // Handle line segment set up

Index: OutputDocument.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/digester/OutputDocument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutputDocument.java	19 Jul 2003 13:16:47 -0000	1.1
--- OutputDocument.java	7 Aug 2003 21:09:02 -0000	1.2
***************
*** 77,80 ****
--- 77,81 ----
    private String rootElement;
    private String rowElement;
+   private String encoding;
  
    /**
***************
*** 112,115 ****
--- 113,133 ----
    public String getRowElement() {
      return rowElement;
+   }
+ 
+   /**
+    * Get the the encoding string
+    * @return
+    */
+   public String getEncoding() {
+     return encoding;
+   }
+ 
+   /**
+    * Set the encoding string
+    *
+    * @param encoding
+    */
+   public void setEncoding(String encoding) {
+     this.encoding = encoding;
    }
  }