[sword-svn] r121 - trunk/flashtools

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-11-09 21:26:45 -0700 (Fri, 09 Nov 2007)
New Revision: 121

Modified:
   trunk/flashtools/flash.cpp
Log:
fixed greek article processing


Modified: trunk/flashtools/flash.cpp
===================================================================
--- trunk/flashtools/flash.cpp	2007-11-09 09:24:36 UTC (rev 120)
+++ trunk/flashtools/flash.cpp	2007-11-10 04:26:45 UTC (rev 121)
@@ -310,7 +310,7 @@
 				if (parts > 1) lemKey.appendFormatted(".%d", i);
 				SWBuf strong = word->second[lemKey];
 				SWBuf text = word->second["Text"];
-				if ((parts > 2) && (strong == "G3588")) {
+				if (strong == "G3588") {
 					text = "[article]";
 				}
 				else {
@@ -321,10 +321,12 @@
 				}
 				Phrase p;
 				p.phrase = text;
-				if (parts > 1) {
+				if ((parts > 1) && (strong != "G3588")) {
 					// lets build our 'with' list excluding ourselves
 					list<SWBuf> withoutMe = lemmas;
 					withoutMe.remove(strong);
+					// special handling of article.  We don't want [+ 3588] all over the place
+					withoutMe.remove("G3588");
 					p.with = vector<SWBuf>(withoutMe.begin(), withoutMe.end());
 				}
 				wordList[strong].kjvFreq[p]++;