------------------------------------------------------------
revno: 113
tags: 1.6.2+dfsg-5ubuntu1
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Wed 2012-11-21 10:07:04 +0000
message:
releasing version 1.6.2+dfsg-5ubuntu1
modified:
debian/changelog
debian/patches/2661.patch
src/modules/swmodule.cpp
--
lp:sword/debian
https://code.launchpad.net/~pkgcrosswire/sword/main
Your team CrossWire Packaging Team is subscribed to branch lp:sword/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-21 02:01:01 +0000
+++ debian/changelog 2012-11-21 10:07:04 +0000
@@ -1,4 +1,4 @@
-sword (1.6.2+dfsg-5ubuntu1) UNRELEASED; urgency=low
+sword (1.6.2+dfsg-5ubuntu1) raring; urgency=low
* Build against clucene-core 2.
=== modified file 'debian/patches/2661.patch'
--- debian/patches/2661.patch 2012-11-21 02:54:01 +0000
+++ debian/patches/2661.patch 2012-11-21 10:07:04 +0000
@@ -6,9 +6,65 @@
X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2661
=== modified file 'src/modules/swmodule.cpp'
---- old/src/modules/swmodule.cpp 2011-07-22 11:03:45 +0000
-+++ new/src/modules/swmodule.cpp 2011-10-29 15:16:41 +0000
-@@ -1317,20 +1299,32 @@
+--- a/src/modules/swmodule.cpp
++++ b/src/modules/swmodule.cpp
+@@ -40,7 +40,6 @@
+
+ #ifdef USELUCENE
+ #include <CLucene.h>
+-#include <CLucene/CLBackwards.h>
+
+ //Lucence includes
+ //#include "CLucene.h"
+@@ -59,6 +58,9 @@
+
+ using std::vector;
+
++extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen);
++extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen);
++
+ SWORD_NAMESPACE_START
+
+ SWDisplay SWModule::rawdisp;
+@@ -1144,7 +1146,7 @@
+
+ lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8
+ // doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED)));
+- doc->add( *Field::Text(_T("key"), wcharBuffer ) );
++ doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) );
+
+
+ if (includeKeyInSearch) {
+@@ -1155,11 +1157,11 @@
+ }
+
+ lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8
+- doc->add( *Field::UnStored(_T("content"), wcharBuffer) );
++ doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED));
+
+ if (strong.length() > 0) {
+ lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE);
+- doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) );
++ doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
+ }
+
+@@ -1280,12 +1282,12 @@
+
+ //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str());
+
+- doc->add( *Field::UnStored(_T("prox"), wcharBuffer) );
++ doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ good = true;
+ }
+ if (proxLem.length() > 0) {
+ lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8
+- doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) );
++ doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ good = true;
+ }
+ if (good) {
+@@ -1303,20 +1305,32 @@
//coreWriter->optimize();
coreWriter->close();
@@ -43,4 +99,3 @@
fsWriter->close();
delete ramDir;
-
=== modified file 'src/modules/swmodule.cpp'
--- src/modules/swmodule.cpp 2012-11-21 03:00:18 +0000
+++ src/modules/swmodule.cpp 2012-11-21 10:07:04 +0000
@@ -40,7 +40,6 @@
#ifdef USELUCENE
#include <CLucene.h>
-#include <CLucene/CLBackwards.h>
//Lucence includes
//#include "CLucene.h"
@@ -59,6 +58,9 @@
using std::vector;
+extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen);
+extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen);
+
SWORD_NAMESPACE_START
SWDisplay SWModule::rawdisp;
@@ -1144,7 +1146,7 @@
lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8
// doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED)));
- doc->add( *Field::Text(_T("key"), wcharBuffer ) );
+ doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) );
if (includeKeyInSearch) {
@@ -1155,11 +1157,11 @@
}
lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8
- doc->add( *Field::UnStored(_T("content"), wcharBuffer) );
+ doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED));
if (strong.length() > 0) {
lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE);
- doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) );
+ doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
//printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
}
@@ -1280,12 +1282,12 @@
//printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str());
- doc->add( *Field::UnStored(_T("prox"), wcharBuffer) );
+ doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
good = true;
}
if (proxLem.length() > 0) {
lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8
- doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) );
+ doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
good = true;
}
if (good) {
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
