[sword-svn] r2181 - in trunk/src/modules/texts: rawtext rawtext4

[scribe at www.crosswire.org]

Author: scribe
Date: 2008-07-14 18:58:11 -0700 (Mon, 14 Jul 2008)
New Revision: 2181

Modified:
   trunk/src/modules/texts/rawtext/rawtext.cpp
   trunk/src/modules/texts/rawtext4/rawtext4.cpp
Log:
Removed the remainder of traces of fastSearch (old impl of a fast search using prebuilt word dictionary)


Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp	2008-07-13 20:29:25 UTC (rev 2180)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp	2008-07-15 01:58:11 UTC (rev 2181)
@@ -45,24 +45,6 @@
 RawText::RawText(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang)
 		: SWText(iname, idesc, idisp, enc, dir, mark, ilang),
 		RawVerse(ipath) {
-		
-#ifndef USELUCENE
-	SWBuf fname;
-	fname = path;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/";
-	
-	for (int loop = 0; loop < 2; loop++) {
-		fastSearch[loop] = 0;
-		SWBuf fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
-		if (FileMgr::existsFile(fastidxname.c_str())) {
-			fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
-			if (FileMgr::existsFile(fastidxname.c_str()))
-				fastSearch[loop] = new RawStr((fname + ((loop)?"ntwords":"otwords")).c_str());
-		}
-	}
-#endif
 }
 
 
@@ -71,13 +53,6 @@
  */
 
 RawText::~RawText() {
-#ifndef USELUCENE
-	if (fastSearch[0])
-		delete fastSearch[0];
-
-	if (fastSearch[1])
-		delete fastSearch[1];
-#endif
 }
 
 

Modified: trunk/src/modules/texts/rawtext4/rawtext4.cpp
===================================================================
--- trunk/src/modules/texts/rawtext4/rawtext4.cpp	2008-07-13 20:29:25 UTC (rev 2180)
+++ trunk/src/modules/texts/rawtext4/rawtext4.cpp	2008-07-15 01:58:11 UTC (rev 2181)
@@ -45,24 +45,6 @@
 RawText4::RawText4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang)
 		: SWText(iname, idesc, idisp, enc, dir, mark, ilang),
 		RawVerse4(ipath) {
-		
-#ifndef USELUCENE
-	SWBuf fname;
-	fname = path;
-	char ch = fname.c_str()[strlen(fname.c_str())-1];
-	if ((ch != '/') && (ch != '\\'))
-		fname += "/";
-	
-	for (int loop = 0; loop < 2; loop++) {
-		fastSearch[loop] = 0;
-		SWBuf fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
-		if (FileMgr::existsFile(fastidxname.c_str())) {
-			fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
-			if (FileMgr::existsFile(fastidxname.c_str()))
-				fastSearch[loop] = new RawStr4((fname + ((loop)?"ntwords":"otwords")).c_str());
-		}
-	}
-#endif
 }
 
 
@@ -71,13 +53,6 @@
  */
 
 RawText4::~RawText4() {
-#ifndef USELUCENE
-	if (fastSearch[0])
-		delete fastSearch[0];
-
-	if (fastSearch[1])
-		delete fastSearch[1];
-#endif
 }