flatpack-svn

[Pzfilereader-svn] SF.net SVN: pzfilereader: [102] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader/xml/PZMapParser.java

[<zep...@us...>]

Revision: 102
          http://svn.sourceforge.net/pzfilereader/?rev=102&view=rev
Author:   zepernick
Date:     2006-10-19 00:16:06 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
added default system type to get around JDOM parse error. More notes in task manager

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-10-19 06:03:30 UTC (rev 101)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-10-19 07:16:06 UTC (rev 102)
@@ -73,7 +73,8 @@
      * returns a Map containing Lists of ColumnMetaData.
      * 
      * @param xmlStream
-     * @return
+     * @return Map
+     *           <records> with their corrisponding 
      * @throws Exception
      */
     public static Map parse(final InputStream xmlStream) throws Exception {
@@ -81,7 +82,11 @@
         builder.setValidation(true);
         // handle the ability to pull DTD from Jar if needed
         builder.setEntityResolver(new ResolveLocalDTD());
-        final Document document = builder.build(xmlStream);
+        
+        //JDOM started to blow up on the parse if the system id param was not specified
+        //not sure why this started to happen now.  Was not making to EntityResolver to pull
+        //dtd out of the jar if needed
+        final Document document = builder.build(xmlStream, "file:///");
 
         final Element root = document.getRootElement();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pzfilereader-svn] SF.net SVN: pzfilereader: [187] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader/xml/PZMapParser.java

[<zep...@us...>]

Revision: 187
          http://svn.sourceforge.net/pzfilereader/?rev=187&view=rev
Author:   zepernick
Date:     2006-11-24 11:27:31 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
put return in catch so it would no longer be empty

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-11-24 19:25:11 UTC (rev 186)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-11-24 19:27:31 UTC (rev 187)
@@ -144,9 +144,8 @@
         try {
             return attribute.getIntValue();
         } catch (final Exception ex) {
+            return 0;
         }
-
-        return 0;
     }
 
     // helper to retrieve the "COLUMN" elements from the given parent


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pzfilereader-svn] SF.net SVN: pzfilereader: [290] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader/xml/PZMapParser.java

[<zep...@us...>]

Revision: 290
          http://svn.sourceforge.net/pzfilereader/?rev=290&view=rev
Author:   zepernick
Date:     2007-03-20 16:13:35 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
- converting xml map parser over to Reader

- Removed parse(File)

- Added parse(Reader)

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-03-20 23:13:22 UTC (rev 289)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-03-20 23:13:35 UTC (rev 290)
@@ -35,6 +35,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -73,35 +75,39 @@
     }
 
     /**
-     * Reads the XMLDocument for a PZMap file. Parses the XML file, and returns
-     * a List of ColumnMetaData.
+     * Method based on InputStream. Reads the XMLDocument for a PZMap
+     * file from an InputStream, WebStart combatible. Parses the XML file, and
+     * returns a Map containing Lists of ColumnMetaData.
      * 
-     * @param xmlFile
-     *            XML file
-     * @return List of ColumnMetaData
-     * @throws Exception
-     * @deprecated
+     * @param xmlStream
+     * @return Map <records> with their corrisponding
+     * @throws IOException
+     * @throws JDOMException
+     * @deprecated please use parse(Reader)
      */
-    public static Map parse(final File xmlFile) throws Exception {
-        final InputStream xmlStream = ParserUtils.createInputStream(xmlFile);
-        Map mdIndex = parse(xmlStream);
-        if (mdIndex == null) {
-            mdIndex = new LinkedHashMap();
+    public static Map parse(final InputStream xmlStream) throws JDOMException, IOException {
+        InputStreamReader isr = null;
+        try {
+            isr = new InputStreamReader(xmlStream);
+            return parse(isr);
+        } finally {
+            if (isr != null) {
+                isr.close();
+            }
         }
-        return mdIndex;
     }
 
     /**
-     * TODO New method based on InputStream. Reads the XMLDocument for a PZMap
+     * New method based on Reader. Reads the XMLDocument for a PZMap
      * file from an InputStream, WebStart combatible. Parses the XML file, and
      * returns a Map containing Lists of ColumnMetaData.
      * 
-     * @param xmlStream
+     * @param xmlStreamReader
      * @return Map <records> with their corrisponding
      * @throws IOException
      * @throws JDOMException
      */
-    public static Map parse(final InputStream xmlStream) throws JDOMException, IOException {
+    public static Map parse(final Reader xmlStreamReader) throws JDOMException, IOException {
         final SAXBuilder builder = new SAXBuilder();
         builder.setValidation(true);
         // handle the ability to pull DTD from Jar if needed
@@ -112,7 +118,7 @@
         // not sure why this started to happen now. Was not making to
         // EntityResolver to pull
         // dtd out of the jar if needed
-        final Document document = builder.build(xmlStream, "file:///");
+        final Document document = builder.build(xmlStreamReader, "file:///");
 
         final Element root = document.getRootElement();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pzfilereader-svn] SF.net SVN: pzfilereader: [291] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader/xml/PZMapParser.java

[<zep...@us...>]

Revision: 291
          http://svn.sourceforge.net/pzfilereader/?rev=291&view=rev
Author:   zepernick
Date:     2007-03-20 17:53:12 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
- Added check for null

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-03-20 23:13:35 UTC (rev 290)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-03-21 00:53:12 UTC (rev 291)
@@ -32,10 +32,13 @@
  */
 package net.sf.pzfilereader.xml;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -108,6 +111,21 @@
      * @throws JDOMException
      */
     public static Map parse(final Reader xmlStreamReader) throws JDOMException, IOException {
+        //use for debug when JDOM complains about the xml
+        /* final BufferedReader br = new BufferedReader(xmlStreamReader);
+        final FileWriter fw = new FileWriter("c:/test.pz");
+        final PrintWriter out = new PrintWriter(fw);
+        String line = null;
+        while ((line = br.readLine()) != null) {
+            out.println(line);
+        }
+        out.flush();
+        fw.close();
+        br.close();*/
+        
+        if (xmlStreamReader == null) {
+            throw new NullPointerException("XML Reader Is Not Allowed To Be Null...");
+        }
         final SAXBuilder builder = new SAXBuilder();
         builder.setValidation(true);
         // handle the ability to pull DTD from Jar if needed


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pzfilereader-svn] SF.net SVN: pzfilereader: [313] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader/xml/PZMapParser.java

[<zep...@us...>]

Revision: 313
          http://svn.sourceforge.net/pzfilereader/?rev=313&view=rev
Author:   zepernick
Date:     2007-05-26 08:39:23 -0700 (Sat, 26 May 2007)

Log Message:
-----------
removed old todo comment

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-05-25 11:12:17 UTC (rev 312)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2007-05-26 15:39:23 UTC (rev 313)
@@ -235,7 +235,6 @@
         showDebug = b;
     }
 
-    //TODO convert to logger instead of system out
     private static void showDebug(final Map xmlResults) {
         final Iterator mapIt = xmlResults.entrySet().iterator();
         while (mapIt.hasNext()) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.