webhelp - Adding enable.stemming, toc.file build properties

diff --git a/xsl-webhelpindexer/Makefile b/xsl-webhelpindexer/Makefile
index 39cd8b45f826c14533a317524cdfb6ba1ffe3e2f..92973d0d50b2412bc26a8f3c0a66febaaf9f22ad 100755 (executable)
--- a/xsl-webhelpindexer/Makefile
+++ b/xsl-webhelpindexer/Makefile
@@ -28,7 +28,7 @@ ANT_OPTS =
 
 all: webhelpindexer.jar
 
-webhelpindexer.jar: $(wildcard src/com/nexwave/nquindexer/*.java)
+webhelpindexer.jar: $(wildcard src/com/nexwave/*/*.java)
        $(ANT) jar
 
 javadoc:

diff --git a/xsl-webhelpindexer/src/com/nexwave/nquindexer/IndexerMain.java b/xsl-webhelpindexer/src/com/nexwave/nquindexer/IndexerMain.java
index 0f16a865d596bb5c0170abf6d3769241baf12b38..dccd2b427e1036738853360f1b03f1e3f60d5b7a 100644 (file)
--- a/xsl-webhelpindexer/src/com/nexwave/nquindexer/IndexerMain.java
+++ b/xsl-webhelpindexer/src/com/nexwave/nquindexer/IndexerMain.java
@@ -61,12 +61,36 @@ public class IndexerMain {
 
     // Constructors
 
+    /**
+     * Create indexer object
+     * The content language defaults to English "en"
+     *
+     * @param htmlDir The directory where html files reside.
+     * @param indexerLanguage the language of the html content
+     * @param htmlExtension the extension for files (.html/.htm/.xhtml etc.)
+     * @param doStem true if the content should be stemmed
+     * @param tocfile table of contents file. 
+     */
+    public IndexerMain(String htmlDir, String indexerLanguage, String htmlExtension, String doStem, String tocfile) {
+        setHtmlDir(htmlDir);
+        setIndexerLanguage(indexerLanguage);
+        setHtmlextension(htmlExtension);
+
+        if(doStem.toUpperCase().trim().equals("TRUE") || doStem.toUpperCase().trim().equals("YES")) {
+            System.out.println("Stemming enabled");                    
+            setStem(true);
+        }
+
+        setTocfile(tocfile);
+
+    }
+
     public IndexerMain(String htmlDir, String indexerLanguage) {
         super();
         setHtmlDir(htmlDir);
         setIndexerLanguage(indexerLanguage);
     }
-
+    
     /**
      * The content language defaults to English "en"
      *
@@ -135,22 +159,21 @@ public class IndexerMain {
      * The main class without Ant dependencies.
      * This can be used as a standalone jar.
      *
-     * @param args need two parameters for this array. htmlDirectory indexerLanguage
-     *             If only one parameter is there (htmlDir), indexerLanguage defaults to english
      */
     public static void main(String[] args) {
 
         IndexerMain indexer;
-        if (args.length == 1) {
-            System.out.println(txt_no_lang_specified);
-            indexer = new IndexerMain(args[0]);
-        } else if (args.length >= 2) {
-
-            indexer = new IndexerMain(args[0], args[1]);
+        if (System.getProperty("htmlDir") != null) {
+            indexer = new IndexerMain(
+                    System.getProperty("htmlDir"),
+                    System.getProperty("indexerLanguage", "en"), //defaults to "en"
+                    System.getProperty("htmlExtension", "html"),
+                    System.getProperty("doStem", "true"), //defaults to true
+                    System.getProperty("tocFile")
+            );
         } else {
-            throw new RuntimeException("Please specify the parameters htmlDirectory and " +
-                    "indexerLanguage (optional). \n " +
-                    "ex: java -jar webhelpindexer.jar docs/content en \n" +
+            throw new RuntimeException("Specify at least the the directory containing html files (htmlDir)\n " +
+                    "ex: java -jar webhelpindexer.jar -DhtmlDir=docs/content -DindexerLanguage=en \n" +
                     "The program will exit now."
             );
         }
@@ -159,7 +182,6 @@ public class IndexerMain {
 
     }
 
-
     /**
      * Implementation of the execute function (Task interface)
      */

diff --git a/xsl/extensions/Makefile b/xsl/extensions/Makefile
index 996c22491c02c4dc6a55a363c8ec378b95d7b93f..c65d4bb0926255c45b7fd1abe8cf231190b0994b 100644 (file)
--- a/xsl/extensions/Makefile
+++ b/xsl/extensions/Makefile
@@ -19,7 +19,7 @@ $(DOCBOOK_SVN)/xsl-saxon/saxon65.jar: $(wildcard $(DOCBOOK_SVN)/xsl-saxon/src/co
 $(DOCBOOK_SVN)/xsl-xalan/xalan27.jar: $(wildcard $(DOCBOOK_SVN)/xsl-xalan/src/com/nwalsh/xalan/*.java) 
        $(MAKE) -C $(dir $@)
 
-$(DOCBOOK_SVN)/xsl-webhelpindexer/webhelpindexer.jar: $(wildcard $(DOCBOOK_SVN)/xsl-webhelpindexer/src/com/nexwave/nquindexer/*.java) 
+$(DOCBOOK_SVN)/xsl-webhelpindexer/webhelpindexer.jar: $(wildcard $(DOCBOOK_SVN)/xsl-webhelpindexer/src/com/nexwave/*/*.java) 
        $(MAKE) -C $(dir $@)
 
 xslt.py: $(DOCBOOK_SVN)/xsl-libxslt/python/xslt.py

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index 7f45d069e3428d0be316ad149bb987ea9e3234b5..a664a723df6dbe0bf9fb1ed4d0f4dcb7403a3aa0 100644 (file)
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -31,6 +31,9 @@ xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar
 # against a dtd.
 validate-against-dtd=true
 
+# The extension for files to be indexed (html/htm/xhtml etc.)
+html.extension=html
+
 # Set this to false if you don't need a search tab.
 webhelp.include.search.tab=true
 
@@ -41,3 +44,10 @@ webhelp.include.search.tab=true
 # zh=Chinese, ja=Japanese etc.  
 webhelp.indexer.language=en
 
+# Enables/Disables stemming
+# Stemming allows better querying for the search
+enable.stemming=true
+
+#Set the table of contents file. This file will not be indexed.
+#toc.file=dummy.html
+

diff --git a/xsl/webhelp/build.xml b/xsl/webhelp/build.xml
index b09b52432ed320d7418714d8530b1c054ee58384..976ae07838e73a6710d1cb05973f1d96e4615507 100644 (file)
--- a/xsl/webhelp/build.xml
+++ b/xsl/webhelp/build.xml
@@ -86,8 +86,10 @@
        <echo>Indexing html files in ${output-dir}/content</echo>
 
        <java classname="com.nexwave.nquindexer.IndexerMain"> 
-        <arg value="${output-dir}/content"/>
-        <arg value="${webhelp.indexer.language}"/>     
+         <sysproperty key="htmlDir" value="${output-dir}/content"/>
+         <sysproperty key="indexerLanguage" value="${webhelp.indexer.language}"/>
+         <sysproperty key="doStem" value="${enable.stemming}"/>
+         <sysproperty key="tocFile" value="${toc.file}"/>
          <classpath>
            <path refid="classpath"/>
            <pathelement location="/usr/share/java/xercesImpl.jar"/>    

diff --git a/xsl/webhelp/template/common/css/positioning.css b/xsl/webhelp/template/common/css/positioning.css
index 682faff07efee4b641fe4ef380e250bca6652640..21cf1ee398a8d379fd8aea42e4ab64756f790c2a 100644 (file)
--- a/xsl/webhelp/template/common/css/positioning.css
+++ b/xsl/webhelp/template/common/css/positioning.css
@@ -180,6 +180,7 @@ p.breadcrumbs {
     font-weight: bold;
     font-size: 10pt
 }
+.searchFieldSet { border: 1px solid #BFBAB0; background-color: #F2EFE9;}
 
 .title, div.toc>p{
        font-weight: bold;