Imported Upstream version 1.5.7

1 files changed, 39 insertions, 23 deletions

diff --git a/include/rawtext.h b/include/rawtext.h
index 6e054cb..2c9f2b9 100644
--- a/include/rawtext.h
+++ b/include/rawtext.h
@@ -2,7 +2,7 @@
  *  rawtext.h   - code for class 'RawText'- a module that reads raw text files:
  *		  ot and nt using indexs ??.bks ??.cps ??.vss
  *
- * $Id: rawtext.h,v 1.23 2002/03/14 16:56:49 scribe Exp $
+ * $Id: rawtext.h,v 1.29 2003/08/29 19:02:44 scribe Exp $
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -29,36 +29,52 @@
 
 #include <defs.h>
 
-class SWDLLEXPORT RawText:public SWText, public RawVerse {
+#ifdef USELUCENE
+namespace lucene { namespace index {
+class IndexReader;
+}}
+
+namespace lucene { namespace search {
+class IndexSearcher;
+}}
+#endif
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawText : public SWText, public RawVerse {
+
+	VerseKey &getVerseKey();
+#ifdef USELUCENE
+	lucene::index::IndexReader *ir;
+	lucene::search::IndexSearcher *is;
+#else
 	RawStr *fastSearch[2];
+#endif
+
 
 public:
   
-    
-	RawText (const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
+	RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
 	const char* ilang = 0);
-	virtual ~ RawText ();
-	virtual char *getRawEntry ();
-     virtual SWModule & operator += (int increment);
-     virtual SWModule & operator -= (int decrement) { return this->operator += (-decrement); }
-	virtual signed char createSearchFramework ();
-	virtual bool hasSearchFramework () { return true; }
-#ifdef _MSC_VER
-	virtual SWModule & operator = (SW_POSITION);
-#else
-	virtual RawText & operator = (SW_POSITION);
-#endif
-	virtual ListKey & Search (const char *istr, int searchType = 0, int flags = 0, SWKey * scope = 0, bool * justCheckIfSupported = 0, void (*percent) (char, void *) = &SWModule::nullPercent, void *percentUserData = 0);
+	virtual ~RawText();
+	virtual SWBuf &getRawEntryBuf();
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+	virtual signed char createSearchFramework();
+	virtual bool hasSearchFramework() { return true; }
+	virtual ListKey &search(const char *istr, int searchType = 0, int flags = 0, SWKey * scope = 0, bool * justCheckIfSupported = 0, void (*percent)(char, void *) = &SWModule::nullPercent, void *percentUserData = 0);
 
 	// write interface ----------------------------
-	virtual bool isWritable () { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & O_RDWR) == O_RDWR)); }
-	static char createModule (const char *path) { return RawVerse::createModule (path); }
-	virtual SWModule & setentry (const char *inbuf, long len);	// Modify current module entry
-	virtual SWModule & operator << (const char *inbuf);	// Modify current module entry
-	virtual SWModule & operator << (const SWKey * linkKey);	// Link current module entry to other module entry
-	virtual void deleteEntry ();	// Delete current module entry
+	virtual bool isWritable() { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & O_RDWR) == O_RDWR)); }
+	static char createModule(const char *path) { return RawVerse::createModule(path); }
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
 	// end write interface ------------------------
-};
 
+	SWMODULE_OPERATORS
+
+};
 
+SWORD_NAMESPACE_END
 #endif