[sword-svn] r2439 - in trunk: . examples/cmdline src/modules

[scribe at crosswire.org]

Author: scribe
Date: 2009-08-09 19:37:42 -0700 (Sun, 09 Aug 2009)
New Revision: 2439

Modified:
   trunk/ChangeLog
   trunk/examples/cmdline/search.cpp
   trunk/src/modules/swmodule.cpp
Log:
	Added checks for Hebrew and Arabic when stripping
		for searching



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-09 22:14:21 UTC (rev 2438)
+++ trunk/ChangeLog	2009-08-10 02:37:42 UTC (rev 2439)
@@ -1,5 +1,11 @@
 API ChangeLog 
 
+
+09-Aug-2009	Troy A. Griffitts <scribe at crosswire.org>
+	Added checks for Hebrew and Arabic when stripping
+		for searching
+
+
 * Release 1.6.0 *
 
 14-May-2009	Troy A. Griffitts <scribe at crosswire.org>

Modified: trunk/examples/cmdline/search.cpp
===================================================================
--- trunk/examples/cmdline/search.cpp	2009-08-09 22:14:21 UTC (rev 2438)
+++ trunk/examples/cmdline/search.cpp	2009-08-10 02:37:42 UTC (rev 2439)
@@ -76,6 +76,7 @@
 	SWBuf searchTerm = argv[2];
 	manager.setGlobalOption("Greek Accents", "Off");
 	manager.setGlobalOption("Strong's Numbers", "On");
+	manager.setGlobalOption("Hebrew Vowel Points", "Off");
 	manager.filterText("Greek Accents", searchTerm);
 
 	it = manager.Modules.find(argv[1]);

Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp	2009-08-09 22:14:21 UTC (rev 2438)
+++ trunk/src/modules/swmodule.cpp	2009-08-10 02:37:42 UTC (rev 2439)
@@ -461,6 +461,8 @@
 	// determine if we might be doing special strip searches.  useful for knowing if we can use shortcuts
 	bool specialStrips = (getConfigEntry("LocalStripFilter")
                        || (getConfig().has("GlobalOptionFilter", "UTF8GreekAccents"))
+                       || (getConfig().has("GlobalOptionFilter", "UTF8HebrewPoints"))
+                       || (getConfig().has("GlobalOptionFilter", "UTF8ArabicPoints"))
                        || (strchr(istr, '<')));
 
 	processEntryAttributes(searchType == -3);
@@ -988,7 +990,10 @@
 		filterSettings.push_back((*filter)->getOptionValue());
 		(*filter)->setOptionValue(*((*filter)->getOptionValues().begin()));
 
-		if (!strcmp("Greek Accents", (*filter)->getOptionName())) {
+		if ( (!strcmp("Greek Accents", (*filter)->getOptionName())) ||
+			(!strcmp("Hebrew Vowel Points", (*filter)->getOptionName())) ||
+			(!strcmp("Arabic Vowel Points", (*filter)->getOptionName()))
+		   ) {
 			(*filter)->setOptionValue("Off");
 		}
 	}