[sword-svn] r501 - in branches/BCB5: . clucene stage

[scribe at crosswire.org]

Author: scribe
Date: 2009-05-05 20:06:36 -0700 (Tue, 05 May 2009)
New Revision: 501

Modified:
   branches/BCB5/clucene/clucene.bpr
   branches/BCB5/mainfrm.cpp
   branches/BCB5/stage/layout.conf
Log:
closer to working av11n

Modified: branches/BCB5/clucene/clucene.bpr
===================================================================
--- branches/BCB5/clucene/clucene.bpr	2009-04-22 09:29:33 UTC (rev 500)
+++ branches/BCB5/clucene/clucene.bpr	2009-05-06 03:06:36 UTC (rev 501)
@@ -18,7 +18,7 @@
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT"/>
+    <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
     <MAINSOURCE value="clucene.bpf"/>
     <INCLUDEPATH value="src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,9 +30,9 @@
     <IDLCFLAGS value="-Isrc\CLucene -Isrc -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
       -DMAX_PATH=256 -DUNICODE -D_WIN32 -D_CL_DISABLE_MULTITHREADING 
       -DLUCENE_ENABLE_REFCOUNT -boa"/>
-    <CFLAG1 value="-O2 -Q -w- -Vx -VF -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
-    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
-    <AFLAGS value="/mx /w2 /zn"/>
+    <CFLAG1 value="-Od -Q -w- -Vx -VF -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zi"/>
     <LFLAGS value="/P256"/>
   </OPTIONS>
   <LINKER>
@@ -96,8 +96,8 @@
 
 [HistoryLists\hlConditionals]
 Count=17
-Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
-Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
 Item2=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
 Item3=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
 Item4=UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING

Modified: branches/BCB5/mainfrm.cpp
===================================================================
--- branches/BCB5/mainfrm.cpp	2009-04-22 09:29:33 UTC (rev 500)
+++ branches/BCB5/mainfrm.cpp	2009-05-06 03:06:36 UTC (rev 501)
@@ -54,6 +54,7 @@
 	SWKey *k = imodule.getKey();
 	VerseKey *vk = SWDYNAMIC_CAST(VerseKey, k);
 	if (last != vk) {
+        	if (last) vk->positionFrom(*last);
                	Form1->fillVKeySelector(vk);
                 last = vk;
 	}

Modified: branches/BCB5/stage/layout.conf
===================================================================
--- branches/BCB5/stage/layout.conf	2009-04-22 09:29:33 UTC (rev 500)
+++ branches/BCB5/stage/layout.conf	2009-05-06 03:06:36 UTC (rev 501)
@@ -39,14 +39,14 @@
 Wesley=
 
 [History]
-LastComModule=Jub
+LastComModule=RWP
 LastLDKey=DAVID
 LastLDModule=ImageSampler
 LastParaMod01=ESV
 LastParaMod02=ASV
 LastParaMod03=NETtext
-LastTextModule=AraSVD
-LastVerse=Leviticus 1:1
+LastTextModule=KJV
+LastVerse=Matthew 1:1
 LookupSaveCount=5
 LookupText=Genesis 1:1
 LookupText=James 4:8
@@ -288,6 +288,7 @@
 LO=
 LXX=
 Latvian=
+LeningradV11N=
 Lithuanian=
 MKJV=
 ManxGaelic=