Minor fixes in the indexer.

Modified TesterIndexer for easier testing of the indexer.

diff --git a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
index 7a616c427c2baf83dda8a119ac23f38aaea7ca5d..b58053e814bf73fd968d6fe9d86fd2e8e7e4fcfb 100755 (executable)
--- a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxDocFileParser.java
@@ -12,6 +12,7 @@ import java.io.PrintWriter;
 \r
 import com.nexwave.nsidita.BlankRemover;\r
 import com.nexwave.nsidita.DocFileInfo;\r
+import org.xml.sax.SAXParseException;\r
 \r
 /**\r
  * Generic parser for populating a DocFileInfo object.\r
@@ -95,7 +96,10 @@ public class SaxDocFileParser extends org.xml.sax.helpers.DefaultHandler {
                        //System.out.println("done parsing " + file.getName() + " >>> " + finish);\r
                        //System.out.println("time = " + (finish - start) + " milliseconds");\r
                        \r
-               }catch(org.xml.sax.SAXException se) {\r
+               }catch(SAXParseException spe){\r
+            System.out.println("SaxParseException: The indexing file contains incorrect xml syntax.");\r
+            spe.printStackTrace();\r
+        }catch(org.xml.sax.SAXException se) {\r
                        System.out.println("SaxException. You may need to include Xerces in your classpath. " +\r
                     "See documentation for details");\r
                        se.printStackTrace(); \r

diff --git a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/TesterIndexer.java b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/TesterIndexer.java
index 80060fc5b088469d676d822ea2db89a6fb12c875..607a2457e9fc80e25ebfb4662cb903f0a48b3ae6 100755 (executable)
--- a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/TesterIndexer.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/TesterIndexer.java
@@ -1,13 +1,12 @@
 package com.nexwave.nquindexer;\r
 \r
-import java.io.File;\r
-\r
 /**\r
  * For running tests with the indexertask.\r
  * \r
  * @version 2.0 2010-08-14\r
  * \r
  * @author N. Quaine\r
+ * @author Kasun Gajasinghe\r
  */\r
     public class TesterIndexer {\r
        public static IndexerTask IT = null; \r
@@ -16,19 +15,23 @@ import java.io.File;
         * @throws InterruptedException \r
         */\r
        public static void main(String[] args) throws InterruptedException {\r
-//\r
-//        File file = new File("test");\r
-//        System.out.println(file.getAbsolutePath());\r
-               System.out.println(args[0]);\r
-               if (args.length == 0 ) {\r
-                       System.out.println("When using the TestIndexer class, you must give the directory of html files to parse as input");\r
-               }\r
-               \r
-               IT = new IndexerTask();\r
-               IT.setHtmldir(args[0]);\r
-               IT.setIndexerLanguage(args[1]);\r
-               IT.execute();\r
-               \r
+        if (args.length != 0) {\r
+            IT = new IndexerTask();\r
+            IT.setHtmldir(args[0]);\r
+            IT.setIndexerLanguage(args[1]);\r
+            IT.execute();\r
+        } else {\r
+            System.out.println("When using the TestIndexer class, you must give the directory of html files to parse as " +\r
+                    "input. Defaulted to '../doc/content' directory and 'English' language.");\r
+\r
+            String dir = "../doc/content";\r
+            String lang = "en";\r
+            IT = new IndexerTask();\r
+            IT.setHtmldir(dir);\r
+            IT.setIndexerLanguage(lang);\r
+            IT.execute();\r
+        }\r
+\r
        }\r
        \r
 }\r

diff --git a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/WriteJSFiles.java b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/WriteJSFiles.java
index db602879bc82ec74d8bf0de6abf97191e66dffc8..fce30bb5f9c1557564eeddac3443df379fac9857 100755 (executable)
--- a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/WriteJSFiles.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/WriteJSFiles.java
@@ -34,7 +34,7 @@ public class WriteJSFiles {
         */\r
        public static void WriteHTMLList (String fileO,ArrayList<String> list) {\r
                int i = 0;\r
-               Iterator it = null;\r
+               Iterator it;\r
                \r
                if (list == null) {\r
                        return;\r