Imported Upstream version 1.7.2+dfsg

1 files changed, 25 insertions, 22 deletions

diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp
index 35b8946..65c4ca8 100644
--- a/src/modules/comments/zcom/zcom.cpp
+++ b/src/modules/comments/zcom/zcom.cpp
@@ -1,9 +1,11 @@
 /******************************************************************************
- *  rawcom.cpp - code for class 'zCom'- a module that reads raw commentary
- *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
  *
+ *  zcom.cpp -	code for class 'zCom'- a module that reads raw commentary
+ *		files
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: zcom.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -23,6 +25,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 
+#include <swbuf.h>
 #include <zverse.h>
 #include <versekey.h>
 #include <zcom.h>
@@ -59,7 +62,7 @@ zCom::~zCom() {
 }
 
 
-bool zCom::isWritable() {
+bool zCom::isWritable() const {
 	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
 }
 
@@ -70,17 +73,17 @@ bool zCom::isWritable() {
  *
  * RET: string buffer with verse
  */
-SWBuf &zCom::getRawEntryBuf() {
+SWBuf &zCom::getRawEntryBuf() const {
 	long  start = 0;
 	unsigned short size = 0;
 	unsigned long buffnum;
 	VerseKey *key = &getVerseKey();
 
-	findOffset(key->Testament(), key->TestamentIndex(), &start, &size, &buffnum);
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size, &buffnum);
 	entrySize = size;        // support getEntrySize call
 
 	entryBuf = "";
-	zReadText(key->Testament(), start, size, buffnum, entryBuf);
+	zReadText(key->getTestament(), start, size, buffnum, entryBuf);
 
 	rawFilter(entryBuf, key);
 
@@ -92,18 +95,18 @@ SWBuf &zCom::getRawEntryBuf() {
 
 
 bool zCom::sameBlock(VerseKey *k1, VerseKey *k2) {
-	if (k1->Testament() != k2->Testament())
+	if (k1->getTestament() != k2->getTestament())
 		return false;
 
 	switch (blockType) {
 	case VERSEBLOCKS:
-		if (k1->Verse() != k2->Verse())
+		if (k1->getVerse() != k2->getVerse())
 			return false;
 	case CHAPTERBLOCKS:
-		if (k1->Chapter() != k2->Chapter())
+		if (k1->getChapter() != k2->getChapter())
 			return false;
 	case BOOKBLOCKS:
-		if (k1->Book() != k2->Book())
+		if (k1->getBook() != k2->getBook())
 			return false;
 	}
 	return true;
@@ -120,7 +123,7 @@ void zCom::setEntry(const char *inbuf, long len) {
 		delete lastWriteKey;
 	}
 
-	doSetText(key->Testament(), key->TestamentIndex(), inbuf, len);
+	doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
 
 	lastWriteKey = (VerseKey *)key->clone();	// must delete
 }
@@ -130,7 +133,7 @@ void zCom::linkEntry(const SWKey *inkey) {
 	VerseKey *destkey = &getVerseKey();
 	const VerseKey *srckey = &getVerseKey(inkey);
 
-	doLinkEntry(destkey->Testament(), destkey->TestamentIndex(), srckey->TestamentIndex());
+	doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
 
 	if (inkey != srckey) // free our key if we created a VerseKey
 		delete srckey;
@@ -145,7 +148,7 @@ void zCom::linkEntry(const SWKey *inkey) {
 void zCom::deleteEntry() {
 
 	VerseKey *key = &getVerseKey();
-	doSetText(key->Testament(), key->TestamentIndex(), "");
+	doSetText(key->getTestament(), key->getTestamentIndex(), "");
 }
 
 
@@ -163,7 +166,7 @@ void zCom::increment(int steps) {
 	unsigned long buffnum;
 	VerseKey *tmpkey = &getVerseKey();
 
-	findOffset(tmpkey->Testament(), tmpkey->TestamentIndex(), &start, &size, &buffnum);
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum);
 
 	SWKey lastgood = *tmpkey;
 	while (steps) {
@@ -173,12 +176,12 @@ void zCom::increment(int steps) {
 		(steps > 0) ? ++(*key) : --(*key);
 		tmpkey = &getVerseKey();
 
-		if ((error = key->Error())) {
+		if ((error = key->popError())) {
 			*key = lastgood;
 			break;
 		}
-		long index = tmpkey->TestamentIndex();
-		findOffset(tmpkey->Testament(), index, &start, &size, &buffnum);
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum);
 		if (
 			(((laststart != start) || (lastsize != size))	// we're a different entry
 //				&& (start > 0) 
@@ -197,10 +200,10 @@ bool zCom::isLinked(const SWKey *k1, const SWKey *k2) const {
 	unsigned long buffnum1, buffnum2;
 	VerseKey *vk1 = &getVerseKey(k1);
 	VerseKey *vk2 = &getVerseKey(k2);
-	if (vk1->Testament() != vk2->Testament()) return false;
+	if (vk1->getTestament() != vk2->getTestament()) return false;
 
-	findOffset(vk1->Testament(), vk1->TestamentIndex(), &start1, &size1, &buffnum1);
-	findOffset(vk2->Testament(), vk2->TestamentIndex(), &start2, &size2, &buffnum2);
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2);
 	return start1 == start2 && buffnum1 == buffnum2;
 }
 
@@ -210,7 +213,7 @@ bool zCom::hasEntry(const SWKey *k) const {
 	unsigned long buffnum;
 	VerseKey *vk = &getVerseKey(k);
 
-	findOffset(vk->Testament(), vk->TestamentIndex(), &start, &size, &buffnum);
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum);
 	return size;
 }