[sword-cvs] sword/bindings/corba/orbitcpp swordorb-impl.cpp,1.10,1.11

sword@www.crosswire.org sword@www.crosswire.org
Thu, 30 Oct 2003 12:06:16 -0700


Update of /usr/local/cvsroot/sword/bindings/corba/orbitcpp
In directory www:/tmp/cvs-serv17538

Modified Files:
	swordorb-impl.cpp 
Log Message:


Index: swordorb-impl.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/bindings/corba/orbitcpp/swordorb-impl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- swordorb-impl.cpp	25 Oct 2003 23:52:14 -0000	1.10
+++ swordorb-impl.cpp	30 Oct 2003 19:06:13 -0000	1.11
@@ -153,13 +153,25 @@
 
 	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
 	if (vkey) {
-		retVal->length(2);
+		retVal->length(6);
 		SWBuf num;
-		num.appendFormatted("%d", vkey->books[vkey->Testament()-1][vkey->Book()-1].chapmax);
+		num.appendFormatted("%d", vkey->Testament());
 		(*retVal)[0] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->books[vkey->Testament()-1][vkey->Book()-1].versemax[vkey->Chapter()-1]);
+		num.appendFormatted("%d", vkey->Book());
 		(*retVal)[1] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->Chapter());
+		(*retVal)[2] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->Verse());
+		(*retVal)[3] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->books[vkey->Testament()-1][vkey->Book()-1].chapmax);
+		(*retVal)[4] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->books[vkey->Testament()-1][vkey->Book()-1].versemax[vkey->Chapter()-1]);
+		(*retVal)[5] = CORBA::string_dup(num.c_str());
 	}
 	else {
 		TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);