Fix for multiple SAX Parsers conflicting with each other.

diff --git a/xsl/webhelp/indexer/lib/nw-cms.jar b/xsl/webhelp/indexer/lib/nw-cms.jar
index 95bedc392491336af3144534d43976e8a7132723..828019a9cea9668466b9c9a48451338d4e1e70d2 100755 (executable)
Binary files a/xsl/webhelp/indexer/lib/nw-cms.jar and b/xsl/webhelp/indexer/lib/nw-cms.jar differ

diff --git a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
index 17ba865dd9d93dfec89d66d38ad4e7681c355217..0b878462ba5a31e7b455c20d90241abde231a5d6 100755 (executable)
--- a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
@@ -10,18 +10,9 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;\r
 import java.io.PrintWriter;\r
 \r
-\r
-import javax.xml.parsers.ParserConfigurationException;\r
-import javax.xml.parsers.SAXParser;\r
-import javax.xml.parsers.SAXParserFactory;\r
-\r
-import org.xml.sax.Attributes;\r
-import org.xml.sax.InputSource;\r
-import org.xml.sax.SAXException;\r
-import org.xml.sax.helpers.DefaultHandler;\r
-\r
 import com.nexwave.nsidita.BlankRemover;\r
 import com.nexwave.nsidita.DocFileInfo;\r
+\r
 /**\r
  * Generic parser for populating a DocFileInfo object.\r
  * \r
@@ -30,7 +21,7 @@ import com.nexwave.nsidita.DocFileInfo;
  * @author N. Quaine\r
  * @author Kasun Gajasinghe\r
  */\r
-public class SaxDocFileParser extends DefaultHandler {\r
+public class SaxDocFileParser extends org.xml.sax.helpers.DefaultHandler {\r
        \r
        //members\r
        protected DocFileInfo fileDesc = null;\r
@@ -75,15 +66,14 @@ public class SaxDocFileParser extends DefaultHandler {
 \r
        public void parseDocument (File file) {\r
                //get a factory\r
-               SAXParserFactory spf = SAXParserFactory.newInstance();\r
+               javax.xml.parsers.SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance();\r
                \r
                spf.setValidating(false);\r
         addContent = false;\r
                divCount = 0;\r
                try {\r
-               \r
                        //get a new instance of parser\r
-                       SAXParser sp = spf.newSAXParser();\r
+                       javax.xml.parsers.SAXParser sp = spf.newSAXParser();\r
                        // deactivate the validation\r
                        sp.getXMLReader().setFeature("http://xml.org/sax/features/external-general-entities", false);\r
                        sp.getXMLReader().setFeature( "http://apache.org/xml/features/nonvalidating/load-external-dtd", false);\r
@@ -101,11 +91,11 @@ public class SaxDocFileParser extends DefaultHandler {
                        //System.out.println("done parsing " + file.getName() + " >>> " + finish);\r
                        //System.out.println("time = " + (finish - start) + " milliseconds");\r
                        \r
-               }catch(SAXException se) {\r
+               }catch(org.xml.sax.SAXException se) {\r
                        System.out.println("SaxException");\r
                        se.printStackTrace();\r
 \r
-               }catch(ParserConfigurationException pce) {\r
+               }catch(javax.xml.parsers.ParserConfigurationException pce) {\r
                        pce.printStackTrace();\r
                }catch (IOException ie) {\r
                        ie.printStackTrace();\r
@@ -117,7 +107,7 @@ public class SaxDocFileParser extends DefaultHandler {
     private boolean doNotIndex=false;\r
     private int divCount = 0;\r
        //SAX parser Event Handlers:\r
-       public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {\r
+       public void startElement(String uri, String localName, String qName, org.xml.sax.Attributes attributes) throws org.xml.sax.SAXException {\r
 \r
                //dwc: capture current element name\r
                currentElName = qName;\r
@@ -183,7 +173,7 @@ public class SaxDocFileParser extends DefaultHandler {
        }\r
 \r
        //triggers when there's character data inside an element.\r
-       public void characters(char[] ch, int start, int length) throws SAXException {\r
+       public void characters(char[] ch, int start, int length) throws org.xml.sax.SAXException {\r
                \r
                // dwc: Bug fix. Don't index contents of script tag.\r
                // dwc: TODO: Add code here to conditionally index or not\r
@@ -198,7 +188,7 @@ public class SaxDocFileParser extends DefaultHandler {
                }\r
        }\r
        \r
-       public void endElement(String uri, String localName, String qName) throws SAXException {\r
+       public void endElement(String uri, String localName, String qName) throws org.xml.sax.SAXException {\r
                if(qName.equalsIgnoreCase("title")) {\r
                        //add it to the list\r
                        //myEmpls.add(tempEmp);\r
@@ -222,7 +212,7 @@ public class SaxDocFileParser extends DefaultHandler {
         } \r
        }\r
        \r
-       public void processingInstruction(String target, String data) throws SAXException {\r
+       public void processingInstruction(String target, String data) throws org.xml.sax.SAXException {\r
                //do nothing\r
                \r
        }\r
@@ -234,8 +224,8 @@ public class SaxDocFileParser extends DefaultHandler {
                System.out.println("entities " + publicId + systemId);\r
                return null;\r
        }*/\r
-       public InputSource resolveEntity(String publicId, String systemId)\r
-       throws SAXException, IOException {\r
+       public org.xml.sax.InputSource resolveEntity(String publicId, String systemId)\r
+       throws org.xml.sax.SAXException, IOException {\r
                //System.out.println("Entities " + publicId + "and" + systemId);\r
                // use dita ot (dost.jar) for resolving dtd paths using the calatog\r
                \r