Changeset 7396

Timestamp:

11/21/06 13:35:34 (5 years ago)

Author:

sys

Message:

bug dans le reader qui dupliquait la déclaration xml + suppr rewindDeclaration non utilisé et manifestement bugué

Location:

trunk/Res_Piccolo/com/bluecast/xml

Files:

• DocumentEntity.java (modified) (3 diffs)
• EntityManager.java (modified) (2 diffs)
• Piccolo.java (modified) (2 diffs)
• PiccoloLexer.java (modified) (2 diffs)
• XMLReaderReader.java (modified) (3 diffs)
• XMLStreamReader.java (modified) (6 diffs)

trunk/Res_Piccolo/com/bluecast/xml/DocumentEntity.java

@@ -73 +73 @@
                     readerReader = new XMLReaderReader();
 
-                    readerReader.reset(sourceReader,true);
+                    readerReader.reset(sourceReader);
                     isStandalone = readerReader.isXMLStandalone();
                     activeReader = readerReader;
@@ -84 +84 @@
                 if (streamReader == null)
                     streamReader = new XMLStreamReader();
-                streamReader.reset(in, source.getEncoding(), true);
+                streamReader.reset(in, source.getEncoding());
                 isOpen = true;
                 isStandalone = streamReader.isXMLStandalone();
@@ -99 +99 @@
         if (streamReader == null)
             streamReader = new XMLStreamReader();
-        streamReader.reset(url.openStream(), encoding, true);
+        streamReader.reset(url.openStream(), encoding);
         isStandalone = streamReader.isXMLStandalone();
         activeReader = streamReader;

trunk/Res_Piccolo/com/bluecast/xml/EntityManager.java

@@ -74 +74 @@
                         if (!isInternal()) {
                                 if (resolver == null) {
-                                        reader = new XMLStreamReader((new URL(sysID)).openStream(), true);
+                                        reader = new XMLStreamReader((new URL(sysID)).openStream());
                                 } else {
                                         InputSource source = resolver.resolveEntity(pubID, sysID);
                                         if (source == null) {
-                                                reader = new XMLStreamReader((new URL(sysID)).openStream(), true);
+                                                reader = new XMLStreamReader((new URL(sysID)).openStream());
                                         } else {
                                                 Reader r = source.getCharacterStream();
                                                 if (r != null)
-                                                        reader = new XMLReaderReader(r, true);
+                                                        reader = new XMLReaderReader(r);
                                                 else {
                                                         InputStream in;
@@ -88 +88 @@
                                                         in = source.getByteStream();
                                                         if (in != null)
-                                                                reader = new XMLStreamReader(in, source.getEncoding(), true);
-                                                        else reader = new XMLStreamReader((new URL(source.getSystemId())).openStream(), source.getEncoding(), true);
+                                                                reader = new XMLStreamReader(in, source.getEncoding());
+                                                        else reader = new XMLStreamReader((new URL(source.getSystemId())).openStream(), source.getEncoding());
                                                 }
                                         }

trunk/Res_Piccolo/com/bluecast/xml/Piccolo.java

@@ -32 +32 @@
 import org.xml.sax.ext.DeclHandler;
 import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.DefaultHandler;
 
 import com.bluecast.io.FileFormatException;
@@ -72 +73 @@
         public static void main(String[] pArgs){
                 try {
-                        Piccolo vParser = new Piccolo();
-                        vParser.parse(new InputSource(new ByteArrayInputStream("<test/>".getBytes("UTF-8"))));//<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+                        Piccolo vParser = new Piccolo(false);
+                        vParser.setContentHandler(new DefaultHandler());
+                        vParser.parse(new InputSource(new ByteArrayInputStream("<test><!-- &amp;dpi=300--></test>".getBytes("UTF-8"))));//<?xml version=\"1.0\" encoding=\"UTF-8\"?>
                 } catch (Exception e) {
                         e.printStackTrace();

trunk/Res_Piccolo/com/bluecast/xml/PiccoloLexer.java

@@ -3027 +3027 @@
         private int yy_currentPos_l;
 
-        private int yy_startRead_l;
-
         private int yy_markedPos_l;
 
@@ -3083 +3081 @@
                         yy_action = -1;
 
-                        yy_startRead_l = yy_currentPos_l = yy_currentPos = yy_startRead = yy_markedPos_l;
+                        yy_currentPos_l = yy_currentPos = yy_startRead = yy_markedPos_l;
 
                         yy_state = yy_lexical_state;

trunk/Res_Piccolo/com/bluecast/xml/XMLReaderReader.java

@@ -37 +37 @@
     private static final int BUFFER_SIZE = 8192;
     private Reader in;
-    private boolean rewindDeclaration;
     private char[] cbuf = new char[BUFFER_SIZE];
     private int cbufPos = 0, cbufEnd = 0;
@@ -59 +58 @@
 
     public XMLReaderReader (Reader in) throws IOException {
-        this(in,true);
-    }
-
-    /**
-     * Creates an XMLReaderReader.
-     *
-     * @param     in the input source
-     * @param     rewindDeclaration a value of false will skip past any
-     *            XML declaration. True will dish out the entire document.
-     */
-    public XMLReaderReader (Reader in, boolean rewindDeclaration)
-    throws IOException {
-        reset(in,rewindDeclaration);
-    }
-
-    public void reset(Reader in, boolean rewindDeclaration)
+        reset(in);
+    }
+
+    public void reset(Reader in)
     throws IOException {
 
         super.resetInput();
         this.in = in;
-        this.rewindDeclaration = rewindDeclaration;
         cbufPos = cbufEnd = 0;
         sawCR = false;
@@ -254 +240 @@
     /* Read [max] characters, parse the <?xml...?> tag
      * push it back onto the stream. Create a reader. Then, if there was
-     * no error parsing the declaration, eat up the declaration.
+     * no error parsing the declaration.
      */
     private void processXMLDecl () throws IOException {
-        int numCharsParsed = parseXMLDeclaration(cbuf,0,cbufEnd);
-
-        if (numCharsParsed > 0) {
-            // Declaration found and parsed
-
-            // Skip the XML declaration unless told otherwise
-            if (!rewindDeclaration)
-                cbufPos += numCharsParsed;
-        }
+        parseXMLDeclaration(cbuf,0,cbufEnd);
     }
 }

trunk/Res_Piccolo/com/bluecast/xml/XMLStreamReader.java

@@ -68 +68 @@
      *            XML declaration. True will dish out the entire document.
      */
-    public XMLStreamReader (InputStream in, boolean rewindDeclaration) throws IOException
+    public XMLStreamReader (InputStream in) throws IOException
     {
-        this(in, null, rewindDeclaration);
+        this(in, null);
     }
 
@@ -76 +76 @@
      * Creates an XMLStreamReader while specifying a character encoding.
      */
-    public XMLStreamReader (InputStream in, String encoding,
-                            boolean rewindDeclaration) throws IOException
+    public XMLStreamReader (InputStream in, String encoding) throws IOException
     {
-        reset(in, encoding, rewindDeclaration);
+        reset(in, encoding);
     }
 
@@ -85 +84 @@
      * Reuses this XMLStreamReader for a different InputStream.
      */
-    public void reset (InputStream in, String encoding,
-                       boolean rewindDeclaration) throws IOException {
+    public void reset (InputStream in, String encoding) throws IOException {
         super.resetInput();
         this.in = in;
         eofReached = false;
-        this.rewindDeclaration = rewindDeclaration;
         useDeclaredEncoding = false;
         bbufPos = bbufEnd = 0;
@@ -675 +672 @@
         
         int bbufPosTemp = bbufPos + decodeResult[0];
-        cbufEnd = decodeResult[1];
+        int cbufEndTemp = decodeResult[1];
         
-        while(r == -2 && ! eofReached && cbufEnd < cbuf.length) {
+        while(r == -2 && ! eofReached && cbufEndTemp < cbuf.length) {
             fillByteBuffer();
             r = decoder.decodeXMLDecl(bbuf, bbufPosTemp, bbufEnd - bbufPosTemp,
-                    cbuf, cbufPos+cbufEnd, cbuf.length-cbufEnd,
+                    cbuf, cbufPos+cbufEndTemp, cbuf.length-cbufEndTemp,
                     decodeResult);
             bbufPosTemp += decodeResult[0];
-                    cbufEnd += decodeResult[1];
-        }
-
-        int numCharsParsed = parseXMLDeclaration(cbuf,0,cbufEnd);
+                    cbufEndTemp += decodeResult[1];
+        }
+
+        parseXMLDeclaration(cbuf,0,cbufEndTemp);
 
         //if (numCharsParsed > 0) {
@@ -694 +691 @@
 
             // Skip the XML declaration unless told otherwise
-            if (!rewindDeclaration)
-                cbufPos += numCharsParsed;
+            //if (!rewindDeclaration)
+            //    cbufPos += numCharsParsed;
 
             // If another encoding was specified, use it instead of the guess.
@@ -702 +699 @@
                 && !declaredEncoding.equalsIgnoreCase(encoding)) {
 
-                cbufPos = cbufEnd = 0;
+                cbufPos = cbufEndTemp = 0;
+                bbufPos = initialBBufPos;
                 decoder.reset();
-
-
-                if (rewindDeclaration)
-                    bbufPos = initialBBufPos;
-                else
-                    bbufPos = numCharsParsed*minBytesPerChar;
 
                 setEncoding(declaredEncoding);