[Gzz-commits] fenfire/org/fenfire impl/SimpleNodeContent.java...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/27 07:45:21

Modified files:
        org/fenfire/impl: SimpleNodeContent.java 
        org/fenfire/swamp/impl: StdLiteral.java 

Log message:
        I hope scandinavic alphabets do work now..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/StdLiteral.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.11 
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.12
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.11        Wed Jun 11 
13:00:24 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java     Fri Jun 27 07:45:21 2003
@@ -25,7 +25,7 @@
  */
 
 package org.fenfire.impl;
-import java.io.StringBufferInputStream;
+import java.io.ByteArrayInputStream;
 
 import org.nongnu.alph.Enfilade1D;
 import org.nongnu.alph.Alph;
@@ -48,7 +48,7 @@
  */
 
 public class SimpleNodeContent implements NodeContent {
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.11 
2003/06/11 17:00:24 tjl Exp $";
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.12 
2003/06/27 11:45:21 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SimpleContent:: 
"+s); }
     SpanReader spanReader;
@@ -131,7 +131,8 @@
        try {
            String xml = l.getRawXMLString();
            if(dbg) pa("Parse: "+saxParser+" "+xml+" "+spanReader);
-           saxParser.parse(new StringBufferInputStream(xml), 
+            byte[] bytes = xml.getBytes("UTF-8");
+           saxParser.parse(new ByteArrayInputStream(bytes), 
                            spanReader);
 
        } catch (Exception e) {
Index: fenfire/org/fenfire/swamp/impl/StdLiteral.java
diff -u fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.4 
fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.5
--- fenfire/org/fenfire/swamp/impl/StdLiteral.java:1.4  Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/swamp/impl/StdLiteral.java      Fri Jun 27 07:45:21 2003
@@ -59,8 +59,9 @@
        if(txtcontent == null) {
            final StringBuffer buf = new StringBuffer();
            try {
+            byte bytes[] = ("<c>"+xmlcontent+"</c>").getBytes("UTF-8");
            saxParser.parse(
-               new StringBufferInputStream("<c>"+xmlcontent+"</c>"),
+               new ByteArrayInputStream(bytes),
                new DefaultHandler() {
                    public void characters(char[] ch, int start, int length){
                        buf.append(ch, start, length);