[sword-svn] r1846 - in trunk: . src/modules

[scribe at crosswire.org]

Author: scribe
Date: 2005-08-04 05:43:03 -0700 (Thu, 04 Aug 2005)
New Revision: 1846

Modified:
   trunk/configure.ac
   trunk/src/modules/swmodule.cpp
Log:
warning on x86_64 shouldn't stop build in debug
turn off greek accents when building lucene index


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-08-04 12:15:12 UTC (rev 1845)
+++ trunk/configure.ac	2005-08-04 12:43:03 UTC (rev 1846)
@@ -152,8 +152,8 @@
   else
     AM_CXXFLAGS="-O0"
   fi
-  AM_CFLAGS="$AM_CFLAGS -Werror"
-  AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
+#  AM_CFLAGS="$AM_CFLAGS -Werror"
+#  AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
 fi
 #  AC_DEFINE(DEBUG)
 #else

Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp	2005-08-04 12:15:12 UTC (rev 1845)
+++ trunk/src/modules/swmodule.cpp	2005-08-04 12:43:03 UTC (rev 1846)
@@ -4,6 +4,7 @@
  *		  etc.)
  */
 
+#include <sysdata.h>
 #include <swmodule.h>
 #include <utilstr.h>
 #include <regex.h>	// GNU
@@ -502,7 +503,7 @@
 			// check to see if it set ok and if so, add to our return list
 			if (*testKey == vk) {
 				listkey << (const char *) vk;
-				listkey.GetElement()->userData = (void *)((int)(h.score(i)*100));
+				listkey.GetElement()->userData = (void *)((__u32)(h.score(i)*100));
 			}
 		}
 		(*percent)(98, percentUserData);
@@ -878,6 +879,10 @@
 	for (FilterList::iterator filter = optionFilters->begin(); filter != optionFilters->end(); filter++) {
 		filterSettings.push_back((*filter)->getOptionValue());
 		(*filter)->setOptionValue(*((*filter)->getOptionValues().begin()));
+
+		if (!strcmp("Greek Accents", (*filter)->getOptionName())) {
+			(*filter)->setOptionValue("Off");
+		}
 	}