[sword-svn] r432 - in trunk: . TntUnicodeControls/BCB5 stage
scribe at crosswire.org
scribe at crosswire.org
Sat Jul 1 14:45:58 MST 2006
Author: scribe
Date: 2006-07-01 14:45:55 -0700 (Sat, 01 Jul 2006)
New Revision: 432
Modified:
trunk/AboutBoxfrm.dfm
trunk/TntUnicodeControls/BCB5/TntLibR.bpk
trunk/searchfrm.cpp
trunk/stage/layout.conf
trunk/stage/options.conf
trunk/sword.bpr
trunk/sword.res
Log:
Fixed numerous bugs related to KJV2006
Added intelligent sorting decision
Added index delete confirmation
Modified: trunk/AboutBoxfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/TntUnicodeControls/BCB5/TntLibR.bpk
===================================================================
--- trunk/TntUnicodeControls/BCB5/TntLibR.bpk 2006-06-30 05:38:04 UTC (rev 431)
+++ trunk/TntUnicodeControls/BCB5/TntLibR.bpk 2006-07-01 21:45:55 UTC (rev 432)
@@ -27,8 +27,8 @@
<USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
- <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib;..\Design"/>
+ <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib;..\Design"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
Modified: trunk/searchfrm.cpp
===================================================================
--- trunk/searchfrm.cpp 2006-06-30 05:38:04 UTC (rev 431)
+++ trunk/searchfrm.cpp 2006-07-01 21:45:55 UTC (rev 432)
@@ -212,6 +212,19 @@
void __fastcall TsearchForm::TSearchThread::Execute()
{
results = parent->target->search(searchText.c_str(), searchType, searchOptions, scope, 0, searchProgressCallback, this);
+
+ // let's make some intuitive decisions on when to sort by score for clucene searches
+ bool sortByScore
+ = ((searchType == -4) // lucene
+ && (results.Count() > 100)
+ && (strchr(searchText.c_str(), ' '))
+ && (!strchr(searchText.c_str(), '+'))
+ && (!strchr(searchText.c_str(), '\"'))
+ && (!strchr(searchText.c_str(), '~'))
+ );
+
+ if ((searchType == -4) && (!sortByScore)) // resort clucene search results if necessary
+ results.sort();
Synchronize((TThreadMethod)&FillListBox);
parent->results = results;
@@ -499,7 +512,8 @@
void __fastcall TsearchForm::toggleIndexBtnClick(TObject *Sender)
{
if (usingSearchFramework) {
- target->deleteSearchFramework();
+ if (MessageBoxW(this->WindowHandle, _tr("Delete Index? Are you sure?"), _tr("Delete Index"), MB_YESNO) == IDYES)
+ target->deleteSearchFramework();
}
else {
progressBar->Hint = "Creating Search Framework";
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-06-30 05:38:04 UTC (rev 431)
+++ trunk/stage/layout.conf 2006-07-01 21:45:55 UTC (rev 432)
@@ -12,20 +12,20 @@
LastParaMod01=
LastParaMod02=
LastParaMod03=
-LastTextModule=TR
-LastVerse=Romans 3:17
+LastTextModule=KJVraw
+LastVerse=Matthew 19:28
LookupSaveCount=5
-LookupText=Romans 3:17
-LookupText=James 1:1
-LookupText=I John 1:1
-LookupText=James 1:19
+LookupText=Matthew 19:28
LookupText=Genesis 1:1
+LookupText=I Corinthians 16:1
+LookupText=1 cor 16
+LookupText=Psalms 4:1
SearchSaveCount=5
-SearchText=<G1578>
-SearchText=εξεκλιναν
-SearchText=lemma:G1578
-SearchText=<G5544>
-SearchText=<5544>
+SearchText=God love +world
+SearchText=God love world
+SearchText=kingdom
+SearchText=regeneration
+SearchText=<H03068>
[LDView]
CBC=
@@ -39,42 +39,44 @@
[ModuleOptions]
Cross-references=Off
Footnotes=Off
-Headings=Off
+Headings=On
Hebrew Cantillation=Off
Hebrew Vowel Points=On
-Morphological Tags=On
-Strong's Numbers=On
+Morphological Tags=Off
+Strong's Numbers=Off
Textual Variants=Primary Reading
Transliteration=Off
-Words of Christ in Red=Off
+Words of Christ in Red=On
[Screen]
MainHeight=749
-MainLeft=46
-MainTop=246
+MainLeft=68
+MainTop=221
MainWidth=1050
Maximized=false
SearchHeight=566
-SearchLeft=411
+SearchLeft=599
SearchMaximized=false
SearchResCol0Width=175
-SearchTop=337
+SearchTop=51
SearchWidth=759
-TextComHeight=284
-TextWidth=502
+TextComHeight=499
+TextWidth=667
[TextView]
-ASV=
-ChiNCVs=
-ChiNCVt=
-ChiUn=
-ChiUns=
-GerNEU=
+ASV=true
+ChiNCVs=true
+ChiNCVt=true
+ChiUn=true
+ChiUns=true
+ESV=
+GerNEU=true
Jub=
-KJV=
-NASB=
-PARALLEL=
-TR=
-WHNU=
-WLC=
+KJV=true
+KJVraw=true
+NASB=true
+PARALLEL=true
+TR=true
+WHNU=true
+WLC=true
Modified: trunk/stage/options.conf
===================================================================
--- trunk/stage/options.conf 2006-06-30 05:38:04 UTC (rev 431)
+++ trunk/stage/options.conf 2006-07-01 21:45:55 UTC (rev 432)
@@ -7,7 +7,7 @@
CommentChHeadSize=
CommentFontColor=0
CommentFontName=Times New Roman
-CommentFontSize=10
+CommentFontSize=14
CommentParagraph=
CommentPostFixTag=
CommentPreFixTag=
@@ -35,7 +35,7 @@
LDChHeadSize=
LDFontColor=0
LDFontName=Times New Roman
-LDFontSize=10
+LDFontSize=14
LDParagraph=
LDPostFixTag=
LDPreFixTag=
@@ -44,9 +44,18 @@
LDVSNumSize=
MorphColor=60534
PopupBackColor=16777215
+PopupBkName=
+PopupChHead=
+PopupChHeadSize=
PopupFontColor=0
PopupFontName=Times New Roman
-PopupFontSize=10
+PopupFontSize=14
+PopupParagraph=
+PopupPostFixTag=
+PopupPreFixTag=
+PopupSuperVS=
+PopupVSNum=
+PopupVSNumSize=
SearchBackColor=16777215
SearchBkName=
SearchChHead=
@@ -67,7 +76,7 @@
TextChHeadSize=
TextFontColor=0
TextFontName=Times New Roman
-TextFontSize=10
+TextFontSize=14
TextParagraph=
TextPostFixTag=
TextPreFixTag=
@@ -76,8 +85,8 @@
TextVSNumSize=
UIBackColor=16777215
UIFontColor=0
-UIFontName=MS Sans Serif
-UIFontSize=8
+UIFontName=Times New Roman
+UIFontSize=14
VSNumberColor=16711680
VerseNewLine=0
locale=en_us
Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr 2006-06-30 05:38:04 UTC (rev 431)
+++ trunk/sword.bpr 2006-07-01 21:45:55 UTC (rev 432)
@@ -75,7 +75,7 @@
MajorVer=1
MinorVer=5
Release=8
-Build=7
+Build=9
Debug=0
PreRelease=0
Special=0
@@ -87,13 +87,13 @@
[Version Info Keys]
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.8.7
+FileVersion=1.5.8.9
InternalName=biblecs
LegalCopyright=(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.8RC3
+ProductVersion=1.5.8rc4
Comments=Seek Him and you will find Him
[HistoryLists\hlIncludePath]
Modified: trunk/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list