bug fix: wrong language code was used for Japanese. Corrected it to "ja".

Applying correct license for German stemmer.

diff --git a/xsl/webhelp/indexer/lib/nw-cms.jar b/xsl/webhelp/indexer/lib/nw-cms.jar
index 828019a9cea9668466b9c9a48451338d4e1e70d2..25e2e13f4bc6c6e1ffb735b13118eda1a21f5454 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/SaxHTMLIndex.java b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxHTMLIndex.java
index d9538aed5b7f5e0ced908a7c460c2ae37e830828..ce5cdda587b63470f130a47eed9f17ec6254f7ae 100755 (executable)
--- a/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxHTMLIndex.java
+++ b/xsl/webhelp/indexer/src/com/nexwave/nquindexer/SaxHTMLIndex.java
@@ -99,7 +99,7 @@ public class SaxHTMLIndex extends SaxDocFileParser{
         //TODO currently, stemming support is for english and german only. Add support for other languages as well.\r
 \r
         String[] tokenizedItems;\r
-        if(indexerLanguage.equalsIgnoreCase("jp") || indexerLanguage.equalsIgnoreCase("cn")\r
+        if(indexerLanguage.equalsIgnoreCase("ja") || indexerLanguage.equalsIgnoreCase("cn")\r
                 || indexerLanguage.equalsIgnoreCase("ko")){\r
                 LinkedList<String> tokens = new LinkedList<String>();\r
             try{\r

diff --git a/xsl/webhelp/template/content/search/stemmers/de_stemmer.js b/xsl/webhelp/template/content/search/stemmers/de_stemmer.js
index 11212c7a76c7d045206a93361c575c754aa6209c..7ff3822a45baa2eb855572a7571fb41e57a2a3f1 100755 (executable)
--- a/xsl/webhelp/template/content/search/stemmers/de_stemmer.js
+++ b/xsl/webhelp/template/content/search/stemmers/de_stemmer.js
@@ -1,12 +1,12 @@
-/**
- * German Stemmer de_stemmer.js
- * Originally developed by Joder Illi
- * Adapted for DocBook WebHelp by Kasun Gajasinghe <kasunbg@gmail.com>
- * Date: 17-07-2010
- * This is the initial release of german stemmer in javascript.
- * Further refactoring would be needed to increase the performance.
- * For other languages, see: http://snowball.tartarus.org/otherlangs/index.html
- * Currently, only german is avaiable in JS
+/*
+ * Author: Joder Illi
+ *
+ * Copyright (c) 2010, FormBlitz AG
+ * All rights reserved.
+ * Implementation of the stemming algorithm from http://snowball.tartarus.org/algorithms/german/stemmer.html
+ * Copyright of the algorithm is: Copyright (c) 2001, Dr Martin Porter and can be found at http://snowball.tartarus.org/license.php
+ *
+ * Redistribution and use in source and binary forms, with or without modification, is covered by the standard BSD license.
  *
  */
 

diff --git a/xsl/webhelp/template/content/search/stemmers/fr_stemmer.js b/xsl/webhelp/template/content/search/stemmers/fr_stemmer.js
index 26b89c8f611936f4bca5342e08c59b2456a3b331..34f974313259eb202cd10cbd8977cf0fb406bda4 100644 (file)
--- a/xsl/webhelp/template/content/search/stemmers/fr_stemmer.js
+++ b/xsl/webhelp/template/content/search/stemmers/fr_stemmer.js
@@ -1,6 +1,6 @@
 /*
  * Author: Kasun Gajasinghe
- * E-Mail: kasunbg@gmail.com
+ * E-Mail: kasunbg AT gmail DOT com
  * Date: 09.08.2010
  *
  * usage: stemmer(word);