From: Kasun Gajasinghe Date: Mon, 19 Sep 2011 19:24:50 +0000 (+0000) Subject: webhelp - Adding enable.stemming, toc.file build properties X-Git-Tag: release/1.79.1~6^2~694 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=849f907a2b6ed1505aec461c35af2396d5692a9d;p=docbook-dsssl webhelp - Adding enable.stemming, toc.file build properties --- diff --git a/xsl-webhelpindexer/Makefile b/xsl-webhelpindexer/Makefile index 39cd8b45f..92973d0d5 100755 --- 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 0f16a865d..dccd2b427 100644 --- 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 996c22491..c65d4bb09 100644 --- 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 7f45d069e..a664a723d 100644 --- 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 b09b52432..976ae0783 100644 --- a/xsl/webhelp/build.xml +++ b/xsl/webhelp/build.xml @@ -86,8 +86,10 @@ Indexing html files in ${output-dir}/content - - + + + + diff --git a/xsl/webhelp/template/common/css/positioning.css b/xsl/webhelp/template/common/css/positioning.css index 682faff07..21cf1ee39 100644 --- 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;