[sword-cvs] sword/include versekey.h,1.31,1.32

[sword at www.crosswire.org]

Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv6848/include

Modified Files:
	versekey.h 
Log Message:

dglassey: add getOSISBookNum to VerseKey so that SWLocale can get a book number from the abbreviation that will be in the new locales
osisbooks etc are moved out of getOSISRef so getOSISBookNum can use them
try to avoid using the same name for local variables and class variables - it's confusing


Index: versekey.h
===================================================================
RCS file: /cvs/core/sword/include/versekey.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- versekey.h	9 Apr 2004 17:43:45 -0000	1.31
+++ versekey.h	7 May 2004 17:22:16 -0000	1.32
@@ -44,6 +44,7 @@
 #define MAXCHAPTER SW_POSITION(POS_MAXCHAPTER)
 #define MAXBOOK SW_POSITION(POS_MAXBOOK)
 
+
 struct sbook
 {
 	/**Name of book
@@ -101,10 +102,15 @@
 	static int instance;
 	static struct sbook otbooks[];
 	static struct sbook ntbooks[];
+	static char *osisotbooks[];
+	static char *osisntbooks[];
+	static char **osisbooks[];
+#if 1
 	static long otbks[];
 	static long otcps[];
 	static long ntbks[];
 	static long ntcps[];
+#endif
 	static int vm[];
 	static LocaleCache localeCache;
 	ListKey internalListKey;
@@ -154,6 +160,12 @@
 	mutable VerseKey *lowerBound, *upperBound;
 
 public:
+#if 0
+	static long otbks[];
+	static long otcps[];
+	static long ntbks[];
+	static long ntcps[];
+#endif
 	static const char builtin_BMAX[2];
 	static struct sbook *builtin_books[2];
 	static const struct abbrev builtin_abbrevs[];
@@ -370,6 +382,7 @@
 	virtual long Index(long iindex);
 
 	virtual const char *getOSISRef() const;
+	static const int getOSISBookNum(const char *bookab);
 
 	virtual ListKey ParseVerseList(const char *buf, const char *defaultKey = "Genesis 1:1", bool expandRange = false);
 	virtual const char *getRangeText() const;