mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
- Re-assign textproc/clucene maintainship to office@. [1]
- Update textproc/clucene to 2.3.3.4. Note this version is required by recent LibreOffice. - Remove textproc/clucene-contrib because it is now integrated into textproc/clucene. [2] - Mark textproc/p5-Lucene as broken. There is no dependent port and it was only written for obsolete Lucene 0.9.x API. [3] - Update deskutils/kdepim4 and deskutils/strigi to build with the new CLucene port. [4] - Update misc/bibletime and misc/sword to use new CLucene 2.3.x API. [5] Approved by: clsung (maintainer timeout) [1] Approved by: tj (maintainer) [2] Approved by: perl [3] Approved by: kde [4] Approved by: tabthorpe (maintainer timeout) [5] Obtained from: The SWORD Project [5]
This commit is contained in:
parent
bccfce66c3
commit
5294672175
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311137
1
MOVED
1
MOVED
@ -4015,3 +4015,4 @@ x11-toolkits/fltk11||2013-01-27|Has expired: new code should use /x11-toolkits/f
|
||||
sysutils/salt|sysutils/py-salt|2013-01-27|Rename to consistency with other Python ports
|
||||
sysutils/salt-cloud|sysutils/py-salt-cloud|2013-01-27|Rename to consistency with other Python ports
|
||||
deskutils/py-dosage|deskutils/dosage|2013-01-28|Rename - it's a standalone application
|
||||
textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene
|
||||
|
@ -1,12 +1,9 @@
|
||||
# New ports collection Makefile for: kdepimp4
|
||||
# Date created: 2008-31-05
|
||||
# Whom: miwi
|
||||
#
|
||||
# Created by: Martin Wilke <miwi@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= kdepim
|
||||
PORTVERSION= ${KDE4_VERSION}
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= deskutils kde ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_KDE}
|
||||
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
|
||||
@ -20,7 +17,7 @@ LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \
|
||||
sasl2:${PORTSDIR}/security/cyrus-sasl2 \
|
||||
boost_thread.4:${PORTSDIR}/devel/boost-libs \
|
||||
grantlee_gui.0:${PORTSDIR}/devel/grantlee \
|
||||
clucene.0:${PORTSDIR}/textproc/clucene
|
||||
clucene-core:${PORTSDIR}/textproc/clucene
|
||||
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
|
||||
RUN_DEPENDS= ${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime
|
||||
|
||||
|
@ -1,12 +1,9 @@
|
||||
# New ports collection Makefile for: strigi
|
||||
# Date created: 2008-01-11
|
||||
# Whom: arved
|
||||
#
|
||||
# Created by: Tilman Keskinoz <arved@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= strigi
|
||||
PORTVERSION= 0.7.7
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= deskutils
|
||||
MASTER_SITES= http://rdieter.fedorapeople.org/strigi/
|
||||
#MASTER_SITES= http://www.vandenoever.info/software/strigi/ \
|
||||
@ -16,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org
|
||||
COMMENT= Desktop searching program
|
||||
|
||||
LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
|
||||
clucene.0:${PORTSDIR}/textproc/clucene \
|
||||
clucene-core:${PORTSDIR}/textproc/clucene \
|
||||
dbus-1:${PORTSDIR}/devel/dbus \
|
||||
exiv2.12:${PORTSDIR}/graphics/exiv2 \
|
||||
boost_thread:${PORTSDIR}/devel/boost-libs
|
||||
|
@ -1,6 +1,6 @@
|
||||
bin/deepfind
|
||||
bin/deepgrep
|
||||
bin/luceneindexer
|
||||
bin/lucene2indexer
|
||||
bin/rdfindexer
|
||||
bin/strigiclient
|
||||
bin/strigicmd
|
||||
@ -95,7 +95,7 @@ lib/strigi/strigiea_digest.so
|
||||
lib/strigi/strigiea_ffmpeg.so
|
||||
lib/strigi/strigiea_jpeg.so
|
||||
lib/strigi/strigiea_riff.so
|
||||
lib/strigi/strigiindex_clucene.so
|
||||
lib/strigi/strigiindex_cluceneng.so
|
||||
lib/strigi/strigila_cpp.so
|
||||
lib/strigi/strigila_deb.so
|
||||
lib/strigi/strigila_namespaceharvester.so
|
||||
|
@ -1,13 +1,8 @@
|
||||
# New ports collection makefile for: bibletime-devel
|
||||
# Date created: 2008-08-12
|
||||
# Whom: Thomas Abthorpe <tabthorpe@FreeBSD.org>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= bibletime
|
||||
PORTVERSION= 2.9.1
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= misc kde
|
||||
MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
|
||||
|
||||
@ -19,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.2.so:${PORTSDIR}/misc/sword
|
||||
BUILD_DEPENDS:= ${RUN_DEPENDS}
|
||||
LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene
|
||||
LIB_DEPENDS= clucene-core:${PORTSDIR}/textproc/clucene
|
||||
|
||||
USE_BZIP2= yes
|
||||
USE_OPENSSL= yes
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= sword
|
||||
PORTVERSION= 1.6.2
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
|
||||
http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
|
||||
@ -45,9 +45,9 @@ CONFIGURE_ARGS+= --without-curl
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MCLUCENE}
|
||||
LIB_DEPENDS+= clucene:${PORTSDIR}/textproc/clucene \
|
||||
LIB_DEPENDS+= clucene-core:${PORTSDIR}/textproc/clucene \
|
||||
icudata:${PORTSDIR}/devel/icu
|
||||
CONFIGURE_ARGS+= --with-clucene --with-icu
|
||||
CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu
|
||||
PLIST_SUB+= ICU="" ICUVER="`${LOCALBASE}/bin/icu-config --version`"
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-clucene --without-icu
|
||||
|
31
misc/sword/files/patch-configure
Normal file
31
misc/sword/files/patch-configure
Normal file
@ -0,0 +1,31 @@
|
||||
--- configure.orig 2010-10-22 17:14:28.000000000 -0400
|
||||
+++ configure 2013-01-10 19:07:36.000000000 -0500
|
||||
@@ -16347,25 +16347,13 @@
|
||||
for flag in $with_clucene; do
|
||||
if test -z "$clucene_set_failed"; then
|
||||
if test -e "$flag/include/CLucene.h"; then
|
||||
-# 64-bit checks first
|
||||
- if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
|
||||
+ if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then
|
||||
clucene_set_failed=$flag
|
||||
- CLUCENE_LIBS="-L$flag/lib64 -lclucene"
|
||||
+ CLUCENE_LIBS="-L$flag/lib -lclucene-core"
|
||||
if test -e "$flag/include/CLucene/clucene-config.h"; then
|
||||
CLUCENE_CXXFLAGS="-I$flag/include"
|
||||
else
|
||||
- CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
|
||||
- fi
|
||||
- else
|
||||
-# 32-bit checks
|
||||
- if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
|
||||
- clucene_set_failed=$flag
|
||||
- CLUCENE_LIBS="-L$flag/lib -lclucene"
|
||||
- if test -e "$flag/include/CLucene/clucene-config.h"; then
|
||||
- CLUCENE_CXXFLAGS="-I$flag/include"
|
||||
- else
|
||||
- CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
|
||||
- fi
|
||||
+ CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
|
||||
fi
|
||||
fi
|
||||
fi
|
94
misc/sword/files/patch-src__modules__swmodule.cpp
Normal file
94
misc/sword/files/patch-src__modules__swmodule.cpp
Normal file
@ -0,0 +1,94 @@
|
||||
--- src/modules/swmodule.cpp.orig 2009-12-28 13:03:22.000000000 -0500
|
||||
+++ src/modules/swmodule.cpp 2013-01-10 18:59:59.000000000 -0500
|
||||
@@ -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;
|
||||
@@ -521,7 +523,7 @@
|
||||
|
||||
// iterate thru each good module position that meets the search
|
||||
bool checkBounds = getKey()->isBoundSet();
|
||||
- for (long i = 0; i < h->length(); i++) {
|
||||
+ for (unsigned long i = 0; i < h->length(); i++) {
|
||||
Document &doc = h->doc(i);
|
||||
|
||||
// set a temporary verse key to this module position
|
||||
@@ -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,20 @@
|
||||
//coreWriter->optimize();
|
||||
coreWriter->close();
|
||||
|
||||
+ d = FSDirectory::getDirectory(target.c_str());
|
||||
if (IndexReader::indexExists(target.c_str())) {
|
||||
- d = FSDirectory::getDirectory(target.c_str(), false);
|
||||
if (IndexReader::isLocked(d)) {
|
||||
IndexReader::unlock(d);
|
||||
}
|
||||
-
|
||||
- fsWriter = new IndexWriter( d, an, false);
|
||||
- } else {
|
||||
- d = FSDirectory::getDirectory(target.c_str(), true);
|
||||
+ fsWriter = new IndexWriter(d, an, false);
|
||||
+ }
|
||||
+ else {
|
||||
fsWriter = new IndexWriter(d, an, true);
|
||||
}
|
||||
|
||||
Directory *dirs[] = { ramDir, 0 };
|
||||
- fsWriter->addIndexes(dirs);
|
||||
+ lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1);
|
||||
+ fsWriter->addIndexes(dirsa);
|
||||
fsWriter->close();
|
||||
|
||||
delete ramDir;
|
@ -69,7 +69,6 @@
|
||||
SUBDIR += cl-ppcre-sbcl
|
||||
SUBDIR += clit
|
||||
SUBDIR += clucene
|
||||
SUBDIR += clucene-contrib
|
||||
SUBDIR += coccigrep
|
||||
SUBDIR += coco
|
||||
SUBDIR += code2html
|
||||
|
@ -1,31 +0,0 @@
|
||||
# New ports collection makefile for: clucene-contrib
|
||||
# Date created: 2010-10-4
|
||||
# Whom: Tom Judge <tom@tomjudge.com>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= clucene-contrib
|
||||
PORTVERSION= 0.9.16a
|
||||
CATEGORIES= textproc
|
||||
MASTER_SITES= SF/clucene/clucene-contribs-unstable/${PORTVERSION}
|
||||
|
||||
MAINTAINER= tj@FreeBSD.org
|
||||
COMMENT= CLucene Contrib Code and Tools
|
||||
|
||||
LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene
|
||||
BUILD_DEPENDS= ${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
USE_LDCONFIG= yes
|
||||
USE_AUTOTOOLS= libtool
|
||||
USE_DOS2UNIX= yes
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if defined(WITH_ASCII_SUPPORT)
|
||||
CONFIGURE_ARGS+= --enable-ascii
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
@ -1,2 +0,0 @@
|
||||
SHA256 (clucene-contrib-0.9.16a.tar.bz2) = 5d0615ec2eda48366d248f84b402db4cfc5d7c65d0eafd2075babf778f41f3aa
|
||||
SIZE (clucene-contrib-0.9.16a.tar.bz2) = 1304048
|
@ -1,13 +0,0 @@
|
||||
--- Makefile.in.orig 2010-06-23 03:47:21.000000000 +0000
|
||||
+++ Makefile.in 2010-06-23 03:48:03.000000000 +0000
|
||||
@@ -178,8 +178,8 @@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
INCLUDES = -I$(top_srcdir)
|
||||
-SUBDIRS = src test
|
||||
-DIST_SUBDIRS = src test win32 .
|
||||
+SUBDIRS = src
|
||||
+DIST_SUBDIRS = src win32 .
|
||||
ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
|
||||
EXTRA_DIST = $(top_srcdir)/autogen.sh \
|
||||
$(top_srcdir)/HACKING \
|
@ -1,10 +0,0 @@
|
||||
--- src/CLucene/analysis/Makefile.am Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/analysis/Makefile.am.orig Tue Dec 5 09:55:45 2006
|
||||
@@ -2,6 +2,7 @@
|
||||
analysisdir = $(lsrcdir)/analysis
|
||||
analysishdir = $(includedir)/CLucene/analysis
|
||||
|
||||
+libclucene_contrib_la_SOURCES += $(analysisdir)/LanguageBasedAnalyzer.cpp
|
||||
libclucene_contrib_la_SOURCES += $(analysisdir)/PorterStemmer.cpp
|
||||
|
||||
analysish_HEADERS = $(analysisdir)/*.h
|
@ -1,43 +0,0 @@
|
||||
--- src/CLucene/analysis/cjk/CJKAnalyzer.cpp.orig 2007-02-10 13:56:33.000000000 +0000
|
||||
+++ src/CLucene/analysis/cjk/CJKAnalyzer.cpp 2010-06-22 07:00:25.000000000 +0000
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "CLucene/StdHeader.h"
|
||||
+#include "CLucene/analysis/Analyzers.h"
|
||||
#include "CJKAnalyzer.h"
|
||||
|
||||
CL_NS_DEF2(analysis,cjk)
|
||||
@@ -180,4 +181,34 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
+CJKAnalyzer::CJKAnalyzer() {
|
||||
+ StopFilter::fillStopTable( &stopTable, CJKAnalyzer::STOP_WORDS);
|
||||
+}
|
||||
+
|
||||
+CJKAnalyzer::CJKAnalyzer(const TCHAR** stopWords) {
|
||||
+ StopFilter::fillStopTable(&stopTable, stopWords);
|
||||
+}
|
||||
+
|
||||
+CJKAnalyzer::~CJKAnalyzer() {
|
||||
+}
|
||||
+
|
||||
+const TCHAR* CJKAnalyzer::STOP_WORDS[] = {
|
||||
+ _T("a"), _T("and"), _T("are"), _T("as"), _T("at"), _T("be"),
|
||||
+ _T("but"), _T("by"), _T("for"), _T("if"), _T("in"),
|
||||
+ _T("into"), _T("is"), _T("it"), _T("no"), _T("not"),
|
||||
+ _T("of"), _T("on"), _T("or"), _T("s"), _T("such"), _T("t"),
|
||||
+ _T("that"), _T("the"), _T("their"), _T("then"),
|
||||
+ _T("there"), _T("these"), _T("they"), _T("this"),
|
||||
+ _T("to"), _T("was"), _T("will"), _T("with"),
|
||||
+ _T("www"),
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+
|
||||
+TokenStream* CJKAnalyzer::tokenStream(const TCHAR* fieldName, Reader* reader) {
|
||||
+ TokenStream* ret = _CLNEW CJKTokenizer(reader);
|
||||
+ ret = _CLNEW StopFilter(ret,true, &stopTable);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
CL_NS_END2
|
@ -1,45 +0,0 @@
|
||||
--- src/CLucene/analysis/cjk/CJKAnalyzer.h Fri Aug 1 17:55:43 2008
|
||||
+++ src/CLucene/analysis/cjk/CJKAnalyzer.h.orig Tue May 27 17:41:14 2008
|
||||
@@ -52,7 +52,7 @@
|
||||
* character buffer, store the characters which are used to compose <br>
|
||||
* the returned Token
|
||||
*/
|
||||
- TCHAR buffer[LUCENE_MAX_WORD_LEN];
|
||||
+ TCHAR buffer[LUCENE_MAX_WORD_LEN+1];
|
||||
|
||||
/**
|
||||
* I/O buffer, used to store the content of the input(one of the <br>
|
||||
@@ -102,6 +102,33 @@
|
||||
};
|
||||
|
||||
|
||||
+/** Represents a CJK analyzer.
|
||||
+ *
|
||||
+ * Filters CJKTokenizer with StopFilter.
|
||||
+ *
|
||||
+ * @author Che, Dong
|
||||
+ */
|
||||
+
|
||||
+class CJKAnalyzer : public CL_NS(analysis)::Analyzer
|
||||
+{
|
||||
+ private:
|
||||
+ CL_NS(util)::CLSetList<const TCHAR*> stopTable;
|
||||
+ public:
|
||||
+ /** Builds an analyzer.*/
|
||||
+ CJKAnalyzer();
|
||||
+
|
||||
+ /** Builds an analyzer with the given stop words. */
|
||||
+ CJKAnalyzer(const TCHAR** stopWords);
|
||||
+
|
||||
+ ~CJKAnalyzer();
|
||||
+
|
||||
+ /** get token stream from input **/
|
||||
+ CL_NS(analysis)::TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
|
||||
+
|
||||
+ /** An array containing some common English words that are not usually useful for
|
||||
+ searching and some double-byte interpunctions. */
|
||||
+ static const TCHAR* STOP_WORDS[];
|
||||
+};
|
||||
|
||||
CL_NS_END2
|
||||
#endif
|
@ -1,14 +0,0 @@
|
||||
--- src/CLucene/highlighter/QueryTermExtractor.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/highlighter/QueryTermExtractor.cpp.orig Mon Nov 20 13:35:09 2006
|
||||
@@ -79,9 +79,9 @@
|
||||
|
||||
void QueryTermExtractor::getTermsFromBooleanQuery(const BooleanQuery * query, WeightedTermList * terms, bool prohibited)
|
||||
{
|
||||
- // TODO: change Query to get the queryclauses and their number in one function call
|
||||
- BooleanClause** queryClauses = query->getClauses();
|
||||
uint32_t numClauses = query->getClauseCount();
|
||||
+ BooleanClause** queryClauses = _CL_NEWARRAY(BooleanClause*,numClauses);
|
||||
+ query->getClauses(queryClauses);
|
||||
|
||||
for (uint32_t i = 0; i < numClauses; i++)
|
||||
{
|
@ -1,91 +0,0 @@
|
||||
--- src/CLucene/highlighter/TokenSources.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/highlighter/TokenSources.cpp.orig Sat Nov 25 11:08:10 2006
|
||||
@@ -27,12 +27,7 @@
|
||||
//to TermPositionVector, we take the token stream
|
||||
//only if the cast works... should have a way of
|
||||
//knowing what type this is
|
||||
- TermPositionVector* tmp = NULL;
|
||||
- try{
|
||||
- tmp = (TermPositionVector*)tfv;
|
||||
- }catch(...){
|
||||
- //ignore
|
||||
- }
|
||||
+ TermPositionVector* tmp = tfv->__asTermPositionVector();
|
||||
if ( tmp != NULL )
|
||||
ts=getTokenStream(tmp);
|
||||
}
|
||||
@@ -73,24 +68,21 @@
|
||||
} */
|
||||
//code to reconstruct the original sequence of Tokens
|
||||
const TCHAR** terms=tpv->getTerms();
|
||||
- const int32_t* freq=tpv->getTermFrequencies();
|
||||
- int32_t freqLen = tpv->size();
|
||||
+ const Array<int32_t>* freq=tpv->getTermFrequencies();
|
||||
|
||||
size_t totalTokens=0;
|
||||
- {
|
||||
- for (int32_t t = 0; t < freqLen; t++)
|
||||
- totalTokens+=freq[t];
|
||||
- }
|
||||
+ for (int32_t i = 0; i < freq->length; i++)
|
||||
+ totalTokens+=freq->values[i];
|
||||
|
||||
Token** tokensInOriginalOrder=NULL;
|
||||
CLSetList<Token*,Token::OrderCompare>* unsortedTokens = NULL;
|
||||
- for (int32_t t = 0; t < freqLen; t++)
|
||||
+ for (int32_t t = 0; t < freq->length; t++)
|
||||
{
|
||||
- TermVectorOffsetInfo** offsets=tpv->getOffsets(t);
|
||||
+ Array<TermVectorOffsetInfo>* offsets=tpv->getOffsets(t);
|
||||
if(offsets==NULL)
|
||||
return NULL;
|
||||
|
||||
- int32_t* pos=NULL;
|
||||
+ Array<int32_t>* pos=NULL;
|
||||
int32_t posLen=0;
|
||||
if(tokenPositionsGuaranteedContiguous)
|
||||
{
|
||||
@@ -107,11 +99,11 @@
|
||||
//tokens NOT stored with positions or not guaranteed contiguous - must add to list and sort later
|
||||
if(unsortedTokens==NULL)
|
||||
unsortedTokens=_CLNEW CLSetList<Token*,Token::OrderCompare>(false);
|
||||
- for (int32_t tp=0; offsets[tp]!=NULL; tp++)
|
||||
+ for (int32_t tp=0; tp < offsets->length; tp++)
|
||||
{
|
||||
unsortedTokens->insert(_CLNEW Token(terms[t],
|
||||
- offsets[tp]->getStartOffset(),
|
||||
- offsets[tp]->getEndOffset()));
|
||||
+ (*offsets)[tp].getStartOffset(),
|
||||
+ (*offsets)[tp].getEndOffset()));
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -124,9 +116,9 @@
|
||||
//tokens stored with positions - can use this to index straight into sorted array
|
||||
for (int32_t tp = 0; tp < posLen; tp++)
|
||||
{
|
||||
- tokensInOriginalOrder[pos[tp]]=_CLNEW Token(terms[t],
|
||||
- offsets[tp]->getStartOffset(),
|
||||
- offsets[tp]->getEndOffset());
|
||||
+ tokensInOriginalOrder[(*pos)[tp]]=_CLNEW Token(terms[t],
|
||||
+ (*offsets)[tp].getStartOffset(),
|
||||
+ (*offsets)[tp].getEndOffset());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -158,13 +150,10 @@
|
||||
|
||||
//todo:bad way of doing this...
|
||||
TermPositionVector* tmp = NULL;
|
||||
- try{
|
||||
- tmp = (TermPositionVector*) tfv; //check to see if tfv is a Tpv
|
||||
- }catch(...){}
|
||||
+ tmp = tfv->__asTermPositionVector();
|
||||
|
||||
if ( tmp != NULL ){
|
||||
- TermPositionVector* tpv=(TermPositionVector*)reader->getTermFreqVector(docId,field);
|
||||
- return getTokenStream(tpv);
|
||||
+ return getTokenStream(tmp);
|
||||
}else{
|
||||
TCHAR buf[250];
|
||||
_sntprintf(buf,250,_T("%s in doc #%d does not have any term position data stored"),field,docId);
|
@ -1,24 +0,0 @@
|
||||
--- src/CLucene/jstreams/Makefile.am Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/Makefile.am.orig Mon Dec 4 18:09:03 2006
|
||||
@@ -2,15 +2,15 @@
|
||||
jstreamsdir = $(lsrcdir)/jstreams
|
||||
jstreamshdir = $(includedir)/CLucene/jstreams
|
||||
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/bz2inputstream.cpp
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/dostime.cpp
|
||||
libclucene_contrib_la_SOURCES += $(jstreamsdir)/fileinputstream.cpp
|
||||
libclucene_contrib_la_SOURCES += $(jstreamsdir)/filereader.cpp
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/gzipcompressstream.cpp
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/gzipinputstream.cpp
|
||||
libclucene_contrib_la_SOURCES += $(jstreamsdir)/inputstreamreader.cpp
|
||||
libclucene_contrib_la_SOURCES += $(jstreamsdir)/subinputstream.cpp
|
||||
-
|
||||
-#libclucene_contrib_la_SOURCES += $(jstreamsdir)/dostime.c
|
||||
-#libclucene_contrib_la_SOURCES += $(jstreamsdir)/tarinputstream.cpp
|
||||
-#libclucene_contrib_la_SOURCES += $(jstreamsdir)/bz2inputstream.cpp
|
||||
-#libclucene_contrib_la_SOURCES += $(jstreamsdir)/gzipinputstream.cpp
|
||||
-#libclucene_contrib_la_SOURCES += $(jstreamsdir)/zipinputstream.cpp
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/tarinputstream.cpp
|
||||
+libclucene_contrib_la_SOURCES += $(jstreamsdir)/zipinputstream.cpp
|
||||
|
||||
jstreamsh_HEADERS = $(jstreamsdir)/*.h
|
@ -1,71 +0,0 @@
|
||||
--- src/CLucene/jstreams/bufferedstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/bufferedstream.h.orig Sat Nov 25 11:03:58 2006
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include "streambase.h"
|
||||
#include "inputstreambuffer.h"
|
||||
+#include <cassert>
|
||||
|
||||
namespace jstreams {
|
||||
|
||||
@@ -32,10 +33,9 @@
|
||||
virtual int32_t fillBuffer(T* start, int32_t space) = 0;
|
||||
// this function might be useful if you want to reuse a bufferedstream
|
||||
void resetBuffer() {printf("implement 'resetBuffer'\n");}
|
||||
-public:
|
||||
BufferedInputStream<T>();
|
||||
+public:
|
||||
int32_t read(const T*& start, int32_t min, int32_t max);
|
||||
- int64_t mark(int32_t readlimit);
|
||||
int64_t reset(int64_t);
|
||||
virtual int64_t skip(int64_t ntoskip);
|
||||
};
|
||||
@@ -55,6 +55,7 @@
|
||||
space = buffer.makeSpace(missing);
|
||||
T* start = buffer.readPos + buffer.avail;
|
||||
nwritten = fillBuffer(start, space);
|
||||
+ assert(StreamBase<T>::status != Eof);
|
||||
if (nwritten > 0) {
|
||||
buffer.avail += nwritten;
|
||||
missing = ntoread - buffer.avail;
|
||||
@@ -75,15 +76,9 @@
|
||||
// do we have enough space in the buffer?
|
||||
writeToBuffer(min);
|
||||
if (StreamBase<T>::status == Error) return -2;
|
||||
- if (StreamBase<T>::status == Eof) return -1;
|
||||
}
|
||||
|
||||
int32_t nread = buffer.read(start, max);
|
||||
-/* if (nread == 0) {
|
||||
- printf("bis: start %p min %i max %i nread %i avail %i bsize %i pos %lli size %lli\n",
|
||||
- start, min, max, nread, buffer.avail, buffer.size, BufferedInputStream<T>::position, BufferedInputStream<T>::size);
|
||||
- printf("buf: start %p readpos %p marpos %p\n", buffer.start, buffer.readPos, buffer.markPos);
|
||||
- }*/
|
||||
|
||||
BufferedInputStream<T>::position += nread;
|
||||
if (BufferedInputStream<T>::position > BufferedInputStream<T>::size
|
||||
@@ -97,6 +92,9 @@
|
||||
} else if (BufferedInputStream<T>::status == Ok && buffer.avail == 0
|
||||
&& finishedWritingToBuffer) {
|
||||
BufferedInputStream<T>::status = Eof;
|
||||
+ if (BufferedInputStream<T>::size == -1) {
|
||||
+ BufferedInputStream<T>::size = BufferedInputStream<T>::position;
|
||||
+ }
|
||||
// save one call to read() by already returning -1 if no data is there
|
||||
if (nread == 0) nread = -1;
|
||||
}
|
||||
@@ -104,13 +102,8 @@
|
||||
}
|
||||
template <class T>
|
||||
int64_t
|
||||
-BufferedInputStream<T>::mark(int32_t readlimit) {
|
||||
- buffer.mark(readlimit);
|
||||
- return StreamBase<T>::position;
|
||||
-}
|
||||
-template <class T>
|
||||
-int64_t
|
||||
BufferedInputStream<T>::reset(int64_t newpos) {
|
||||
+ assert(newpos >= 0);
|
||||
if (StreamBase<T>::status == Error) return -2;
|
||||
// check to see if we have this position
|
||||
int64_t d = BufferedInputStream<T>::position - newpos;
|
@ -1,29 +0,0 @@
|
||||
--- src/CLucene/jstreams/fileinputstream.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/fileinputstream.cpp.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
const int32_t FileInputStream::defaultBufferSize = 1048576;
|
||||
FileInputStream::FileInputStream(const char *filepath, int32_t buffersize) {
|
||||
-
|
||||
// try to open the file for reading
|
||||
file = fopen(filepath, "rb");
|
||||
this->filepath = filepath;
|
||||
@@ -21,7 +20,7 @@
|
||||
error = "Could not read file '";
|
||||
error += filepath;
|
||||
error += "': ";
|
||||
- error += strerror(errno);
|
||||
+ error += strerror(errno);
|
||||
status = Error;
|
||||
return;
|
||||
}
|
||||
@@ -47,7 +46,8 @@
|
||||
}
|
||||
|
||||
// allocate memory in the buffer
|
||||
- mark(buffersize);
|
||||
+ int32_t bufsize = (size <= buffersize) ?size+1 :buffersize;
|
||||
+ mark(bufsize);
|
||||
}
|
||||
FileInputStream::~FileInputStream() {
|
||||
if (file) {
|
@ -1,12 +0,0 @@
|
||||
--- src/CLucene/jstreams/fileinputstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/fileinputstream.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -18,7 +18,8 @@
|
||||
|
||||
public:
|
||||
static const int32_t defaultBufferSize;
|
||||
- FileInputStream(const char *filepath, int32_t buffersize=defaultBufferSize);
|
||||
+ explicit FileInputStream(const char *filepath,
|
||||
+ int32_t buffersize=defaultBufferSize);
|
||||
~FileInputStream();
|
||||
int32_t fillBuffer(char* start, int32_t space);
|
||||
};
|
@ -1,14 +0,0 @@
|
||||
--- src/CLucene/jstreams/filereader.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/filereader.cpp.orig Sat Nov 25 11:03:58 2006
|
||||
@@ -26,11 +26,6 @@
|
||||
return nread;
|
||||
}
|
||||
int64_t
|
||||
-FileReader::mark(int32_t readlimit) {
|
||||
- int64_t mp = reader->mark(readlimit);
|
||||
- return mp;
|
||||
-}
|
||||
-int64_t
|
||||
FileReader::reset(int64_t newpos) {
|
||||
position = reader->reset(newpos);
|
||||
if (position < -1) {
|
@ -1,16 +0,0 @@
|
||||
--- src/CLucene/jstreams/filereader.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/filereader.h.orig Sat Nov 25 11:03:58 2006
|
||||
@@ -11,12 +11,11 @@
|
||||
FileInputStream* input;
|
||||
InputStreamReader* reader;
|
||||
public:
|
||||
- FileReader(const char* fname, const char* encoding_scheme=NULL,
|
||||
+ explicit FileReader(const char* fname, const char* encoding_scheme=NULL,
|
||||
const int32_t cachelen = 13,
|
||||
const int32_t cachebuff = 14 );
|
||||
~FileReader();
|
||||
int32_t read(const wchar_t*& start, int32_t min, int32_t max);
|
||||
- int64_t mark(int32_t readlimit);
|
||||
int64_t reset(int64_t);
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- src/CLucene/jstreams/gzipinputstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/gzipinputstream.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -24,7 +24,8 @@
|
||||
bool checkMagic();
|
||||
public:
|
||||
enum ZipFormat { ZLIBFORMAT, GZIPFORMAT, ZIPFORMAT};
|
||||
- GZipInputStream(StreamBase<char>* input, ZipFormat format=GZIPFORMAT);
|
||||
+ explicit GZipInputStream(StreamBase<char>* input,
|
||||
+ ZipFormat format=GZIPFORMAT);
|
||||
~GZipInputStream();
|
||||
int32_t fillBuffer(char* start, int32_t space);
|
||||
};
|
@ -1,117 +0,0 @@
|
||||
--- src/CLucene/jstreams/inputstreambuffer.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/inputstreambuffer.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -19,14 +19,10 @@
|
||||
int32_t size;
|
||||
T* readPos;
|
||||
int32_t avail;
|
||||
- T* markPos;
|
||||
- int32_t markLimit;
|
||||
|
||||
InputStreamBuffer();
|
||||
~InputStreamBuffer();
|
||||
void setSize(int32_t size);
|
||||
- void mark(int32_t readlimit);
|
||||
- void reset();
|
||||
int32_t read(const T*& start, int32_t max=0);
|
||||
|
||||
/**
|
||||
@@ -38,7 +34,7 @@
|
||||
|
||||
template <class T>
|
||||
InputStreamBuffer<T>::InputStreamBuffer() {
|
||||
- markPos = readPos = start = 0;
|
||||
+ readPos = start = 0;
|
||||
size = avail = 0;
|
||||
}
|
||||
template <class T>
|
||||
@@ -50,7 +46,6 @@
|
||||
InputStreamBuffer<T>::setSize(int32_t size) {
|
||||
// store pointer information
|
||||
int32_t offset = readPos - start;
|
||||
- int32_t markOffset = (markPos) ? markPos - start : -1;
|
||||
|
||||
// allocate memory in the buffer
|
||||
start = (T*)realloc(start, size*sizeof(T));
|
||||
@@ -58,52 +53,6 @@
|
||||
|
||||
// restore pointer information
|
||||
readPos = start + offset;
|
||||
- markPos = (markOffset == -1) ?0 :start + markOffset;
|
||||
-}
|
||||
-template <class T>
|
||||
-void
|
||||
-InputStreamBuffer<T>::mark(int32_t limit) {
|
||||
- // if there's no buffer yet, allocate one now
|
||||
- if (start == 0) {
|
||||
- setSize(limit+1);
|
||||
- }
|
||||
- // if we had a larger limit defined for the same position, do nothing
|
||||
- if (readPos == markPos && limit <= markLimit) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- markLimit = limit;
|
||||
- // if we have enough room, only set the mark
|
||||
- int32_t offset = readPos - start;
|
||||
- if (size - offset >= limit) {
|
||||
- markPos = readPos;
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- // if we don't have enough room start by
|
||||
- // moving memory to the start of the buffer
|
||||
- if (readPos != start) {
|
||||
- memmove(start, readPos, avail*sizeof(T));
|
||||
- readPos = start;
|
||||
- }
|
||||
-
|
||||
- // if we have enough room now, finish
|
||||
- if (size >= limit) {
|
||||
- markPos = readPos;
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- // last resort: increase buffer size
|
||||
- setSize(limit+1);
|
||||
- markPos = readPos;
|
||||
-}
|
||||
-template <class T>
|
||||
-void
|
||||
-InputStreamBuffer<T>::reset() {
|
||||
- if (markPos != 0) {
|
||||
- avail += readPos - markPos;
|
||||
- readPos = markPos;
|
||||
- }
|
||||
}
|
||||
template <class T>
|
||||
int32_t
|
||||
@@ -115,28 +64,16 @@
|
||||
return space;
|
||||
}
|
||||
|
||||
- if (markPos && readPos - markPos <= markLimit) {
|
||||
- // move data to the start of the buffer while respecting the set mark
|
||||
- if (markPos != start) {
|
||||
-// printf("moving with mark\n");
|
||||
- int32_t n = avail + readPos - markPos;
|
||||
- memmove(start, markPos, n*sizeof(T));
|
||||
- readPos -= markPos - start;
|
||||
- space += markPos - start;
|
||||
- markPos = start;
|
||||
- }
|
||||
- } else if (avail) {
|
||||
+ if (avail) {
|
||||
if (readPos != start) {
|
||||
// printf("moving\n");
|
||||
// move data to the start of the buffer
|
||||
memmove(start, readPos, avail*sizeof(T));
|
||||
space += readPos - start;
|
||||
readPos = start;
|
||||
- markPos = 0;
|
||||
}
|
||||
} else {
|
||||
// we may start writing at the start of the buffer
|
||||
- markPos = 0;
|
||||
readPos = start;
|
||||
space = size;
|
||||
}
|
@ -1,29 +0,0 @@
|
||||
--- src/CLucene/jstreams/inputstreamreader.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/inputstreamreader.cpp.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifndef ICONV_CONST
|
||||
//we try to guess whether the iconv function requires
|
||||
//a const char. We have no way of automatically figuring
|
||||
- //this out if we didnt use autoconf, so we guess based
|
||||
+ //this out if we did not use autoconf, so we guess based
|
||||
//on certain parameters:
|
||||
#ifdef _LIBICONV_H
|
||||
#define ICONV_CONST const
|
||||
@@ -49,7 +49,7 @@
|
||||
return;
|
||||
}
|
||||
charbuf.setSize(262);
|
||||
- mark(262);
|
||||
+ //mark(262);
|
||||
charsLeft = 0;
|
||||
}
|
||||
InputStreamReader::~InputStreamReader() {
|
||||
@@ -86,7 +86,7 @@
|
||||
nwritten = space;
|
||||
break;
|
||||
default:
|
||||
- exit(-1);
|
||||
+ printf("InputStreamReader::error %d\n", errno);
|
||||
}
|
||||
} else { //input sequence was completely converted
|
||||
charbuf.readPos = charbuf.start;
|
@ -1,11 +0,0 @@
|
||||
--- src/CLucene/jstreams/inputstreamreader.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/inputstreamreader.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -29,7 +29,7 @@
|
||||
void readFromStream();
|
||||
int32_t decode(wchar_t* start, int32_t space);
|
||||
public:
|
||||
- InputStreamReader(StreamBase<char> *i, const char *enc=0);
|
||||
+ explicit InputStreamReader(StreamBase<char> *i, const char *enc=0);
|
||||
~InputStreamReader();
|
||||
int32_t fillBuffer(wchar_t* start, int32_t space);
|
||||
};
|
@ -1,142 +0,0 @@
|
||||
--- src/CLucene/jstreams/streambase.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/streambase.h.orig Sat Nov 25 11:03:58 2006
|
||||
@@ -17,13 +17,14 @@
|
||||
|
||||
/**
|
||||
* @short Base class for stream read access to many different file types.
|
||||
- *
|
||||
+ *
|
||||
* This class is based on the interface java.io.InputStream. It allows
|
||||
* for uniform access to streamed resources.
|
||||
* The main difference with the java equivalent is a performance improvement.
|
||||
* When reading data, data is not copied into a buffer provided by the caller,
|
||||
- * but a pointer to the read data is provided. This makes this interface especially
|
||||
- * useful for deriving from it and implementing filterers or transformers.
|
||||
+ * but a pointer to the read data is provided. This makes this interface
|
||||
+ * especially useful for deriving from it and implementing filterers or
|
||||
+ * transformers.
|
||||
*/
|
||||
// java mapping: long=int64, int=int32, byte=uint8_t
|
||||
template <class T>
|
||||
@@ -37,29 +38,24 @@
|
||||
StreamBase() :size(-1), position(0), status(Ok){ }
|
||||
virtual ~StreamBase(){}
|
||||
/**
|
||||
- * Return a string representation of the last error that has occurred.
|
||||
+ * @brief Return a string representation of the last error.
|
||||
* If no error has occurred, an empty string is returned.
|
||||
**/
|
||||
const char* getError() const { return error.c_str(); }
|
||||
StreamStatus getStatus() const { return status; }
|
||||
+ /**
|
||||
+ * @brief Get the current position in the stream.
|
||||
+ * The value obtained from this function can be used to reset the stream.
|
||||
+ **/
|
||||
int64_t getPosition() const { return position; }
|
||||
- int64_t getSize() const { return size; }
|
||||
- /**
|
||||
- * @brief Reads @p ntoread characters from the stream and sets \a start to
|
||||
- * the first character that was read.
|
||||
- *
|
||||
- * If @p ntoread is @c 0, then at least one character will be read.
|
||||
- *
|
||||
- * @param start Pointer passed by reference that will be set to point to
|
||||
- * the retrieved array of characters. If the end of the stream
|
||||
- * is encountered or an error occurs, the value of @p start
|
||||
- * is undefined.
|
||||
- * @return the number of characters that were read. If 0 is returned, the
|
||||
- * end of the stream has been reached. If -1 is returned, an error
|
||||
- * has occured.
|
||||
+ /**
|
||||
+ * @brief Return the size of the stream.
|
||||
+ * If the size of the stream is unknown, -1
|
||||
+ * is returned. If the end of the stream has been reached the size is
|
||||
+ * always known.
|
||||
**/
|
||||
- // virtual int32_t read(const T*& start) = 0;
|
||||
- /**
|
||||
+ int64_t getSize() const { return size; }
|
||||
+ /**
|
||||
* @brief Reads characters from the stream and sets \a start to
|
||||
* the first character that was read.
|
||||
*
|
||||
@@ -73,61 +69,34 @@
|
||||
* @p is @c 0 the stream reads at least 1 character.
|
||||
* @return the number of characters that were read. If -1 is returned, the
|
||||
* end of the stream has been reached. If -2 is returned, an error
|
||||
- * has occured.
|
||||
+ * has occurred.
|
||||
**/
|
||||
virtual int32_t read(const T*& start, int32_t min, int32_t max) = 0;
|
||||
/**
|
||||
- * Same as read(const T*& start, int32_t ntoread), but may read more.
|
||||
- **/
|
||||
-// virtual int32_t readAtLeast(const T*& start, int32_t ntoread) = 0;
|
||||
- /* the available value may be greater than the actual value if
|
||||
- the encoding is a variable one (such as utf8 or unicode) */
|
||||
- /**
|
||||
* Skip @param ntoskip bytes. Unless an error occurs or the end of file is
|
||||
* encountered, this amount of bytes is skipped.
|
||||
- * The optional @param skipped can be use to find out how many bites were skipped.
|
||||
- * If the end of stream is reached, Eof is returned.
|
||||
- * If an error occured, Error is returned.
|
||||
+ * This function returns new position in the stream.
|
||||
**/
|
||||
virtual int64_t skip(int64_t ntoskip);
|
||||
- /**
|
||||
- * \short Marks the current position in this input stream.
|
||||
- * A subsequent call to the reset method repositions this stream at the
|
||||
- * last marked position so that subsequent reads re-read the same bytes.
|
||||
- *
|
||||
- * The readlimit arguments tells this input stream to allow that many
|
||||
- * bytes to be read before the mark position gets invalidated.
|
||||
- * The stream somehow remembers all the bytes read after the call to mark
|
||||
- * and stands ready to supply those same bytes again if and whenever the
|
||||
- * method reset is called. However, the stream is not required to remember
|
||||
- * any data at all if more than readlimit bytes are read from the stream
|
||||
- * before reset is called.
|
||||
- *
|
||||
- * When calling the method mark more than once at the same position in the
|
||||
- * stream, the call with the largest value for \p readlimit is defining.
|
||||
- **/
|
||||
- virtual int64_t mark(int32_t readlimit) = 0;
|
||||
/**
|
||||
- * \short Repositions this stream to given requested position.
|
||||
- * The general contract of reset is:
|
||||
- * - Reset is guaranteed to work after a successfull call to read(),
|
||||
- * when new position is in the range of the data returned by read().
|
||||
- * This means that @p pos must lie between than the position
|
||||
- * corresponding to the @p start parameter (x) of the @r read function
|
||||
- * and the position corresponding to the last position in the returned
|
||||
- * buffer (x + @p nread).
|
||||
- * if If the method mark has not been called since the stream was created,
|
||||
- * or the number of bytes read from the stream since mark was last
|
||||
- * called is larger than the argument to mark at that last call, then
|
||||
- * Error is returned.
|
||||
- * - Otherwise the stream is reset to a state such that all the bytes
|
||||
- * read since the most recent call to mark (or since the start of the
|
||||
- * file, if mark has not been called) will be resupplied to subsequent
|
||||
- * callers of the read method, followed by any bytes that otherwise
|
||||
- * would have been the next input data as of the time of the call to
|
||||
- * reset.
|
||||
+ * @brief Repositions this stream to given requested position.
|
||||
+ * Reset is guaranteed to work after a successful call to read(),
|
||||
+ * when the new position is in the range of the data returned by read().
|
||||
+ * This means that @p pos must lie between than the position
|
||||
+ * corresponding to the @p start parameter (x) of the @r read function
|
||||
+ * and the position corresponding to the last position in the returned
|
||||
+ * buffer (x + @p nread).
|
||||
**/
|
||||
virtual int64_t reset(int64_t pos) = 0;
|
||||
+ /**
|
||||
+ * deprecated function
|
||||
+ **/
|
||||
+ int64_t mark(int32_t readlimit) {
|
||||
+ int64_t p = getPosition();
|
||||
+ const T* ptr;
|
||||
+ read(ptr, readlimit, -1);
|
||||
+ return reset(p);
|
||||
+ }
|
||||
};
|
||||
#define SKIPSTEP 1024
|
||||
template <class T>
|
@ -1,58 +0,0 @@
|
||||
--- src/CLucene/jstreams/stringreader.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/stringreader.h.orig Sat Nov 25 11:03:58 2006
|
||||
@@ -1,6 +1,18 @@
|
||||
+/*------------------------------------------------------------------------------
|
||||
+* Copyright (C) 2003-2006 Jos van den Oever
|
||||
+*
|
||||
+* Distributable under the terms of either the Apache License (Version 2.0) or
|
||||
+* the GNU Lesser General Public License, as specified in the COPYING file.
|
||||
+------------------------------------------------------------------------------*/
|
||||
#ifndef STRINGREADER_H
|
||||
#define STRINGREADER_H
|
||||
|
||||
+/**
|
||||
+ * Author: Jos van den Oever
|
||||
+ * Ben van Klinken
|
||||
+ **/
|
||||
+
|
||||
+
|
||||
#include "streambase.h"
|
||||
|
||||
namespace jstreams {
|
||||
@@ -18,18 +30,18 @@
|
||||
~StringReader();
|
||||
int32_t read(const T*& start, int32_t min, int32_t max);
|
||||
int64_t skip(int64_t ntoskip);
|
||||
- int64_t mark(int32_t readlimit);
|
||||
int64_t reset(int64_t pos);
|
||||
};
|
||||
|
||||
+typedef StringReader<char> StringInputStream;
|
||||
+
|
||||
template <class T>
|
||||
StringReader<T>::StringReader(const T* value, int32_t length, bool copy)
|
||||
: markpt(0), dataowner(copy) {
|
||||
if (length < 0) {
|
||||
- if (sizeof(T) > 1) {
|
||||
- length = wcslen((const wchar_t*)value);
|
||||
- } else {
|
||||
- length = strlen((const char*)value);
|
||||
+ length = 0;
|
||||
+ while (value[length] != '\0') {
|
||||
+ length++;
|
||||
}
|
||||
}
|
||||
StreamBase<T>::size = length;
|
||||
@@ -71,12 +83,6 @@
|
||||
StringReader<T>::skip(int64_t ntoskip) {
|
||||
const T* start;
|
||||
return read(start, ntoskip, ntoskip);
|
||||
-}
|
||||
-template <class T>
|
||||
-int64_t
|
||||
-StringReader<T>::mark(int32_t /*readlimit*/) {
|
||||
- markpt = StreamBase<T>::position;
|
||||
- return markpt;
|
||||
}
|
||||
template <class T>
|
||||
int64_t
|
@ -1,51 +0,0 @@
|
||||
--- src/CLucene/jstreams/subinputstream.cpp Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/subinputstream.cpp.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -31,7 +31,7 @@
|
||||
}
|
||||
int32_t nread = input->read(start, min, max);
|
||||
if (nread < -1) {
|
||||
- printf("substream too short.\n");
|
||||
+ fprintf(stderr, "substream too short.\n");
|
||||
status = Error;
|
||||
error = input->getError();
|
||||
} else if (nread < min) {
|
||||
@@ -42,9 +42,9 @@
|
||||
size = position;
|
||||
}
|
||||
} else {
|
||||
- printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! nread %i min %i max %i size %lli\n", nread, min, max, size);
|
||||
- printf("pos %lli parentpos %lli\n", position, input->getPosition());
|
||||
- printf("status: %i error: %s\n", input->getStatus(), input->getError());
|
||||
+// fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! nread %i min %i max %i size %lli\n", nread, min, max, size);
|
||||
+// fprintf(stderr, "pos %lli parentpos %lli\n", position, input->getPosition());
|
||||
+// fprintf(stderr, "status: %i error: %s\n", input->getStatus(), input->getError());
|
||||
// we expected data but didn't get enough so that's an error
|
||||
status = Error;
|
||||
error = "Premature end of stream\n";
|
||||
@@ -59,21 +59,18 @@
|
||||
return nread;
|
||||
}
|
||||
int64_t
|
||||
-SubInputStream::mark(int32_t readlimit) {
|
||||
- position = input->mark(readlimit) - offset;
|
||||
- return position;
|
||||
-}
|
||||
-int64_t
|
||||
SubInputStream::reset(int64_t newpos) {
|
||||
- //printf("subreset pos: %lli newpos: %lli offset: %lli\n", position,
|
||||
- // newpos, offset);
|
||||
+ assert(newpos >= 0);
|
||||
+// fprintf(stderr, "subreset pos: %lli newpos: %lli offset: %lli\n", position,
|
||||
+// newpos, offset);
|
||||
position = input->reset(newpos + offset);
|
||||
if (position < offset) {
|
||||
- printf("###########\n");
|
||||
+ fprintf(stderr, "########### position %lli newpos %lli\n", position, newpos);
|
||||
status = Error;
|
||||
error = input->getError();
|
||||
} else {
|
||||
position -= offset;
|
||||
+ status = input->getStatus();
|
||||
}
|
||||
return position;
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
--- src/CLucene/jstreams/subinputstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/subinputstream.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -18,7 +18,6 @@
|
||||
public:
|
||||
SubInputStream(StreamBase<char> *input, int64_t size=-1);
|
||||
int32_t read(const char*& start, int32_t min, int32_t max);
|
||||
- int64_t mark(int32_t readlimit);
|
||||
int64_t reset(int64_t newpos);
|
||||
int64_t skip(int64_t ntoskip);
|
||||
};
|
@ -1,35 +0,0 @@
|
||||
--- src/CLucene/jstreams/substreamprovider.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/substreamprovider.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -16,8 +16,9 @@
|
||||
std::string filename;
|
||||
int32_t size;
|
||||
uint mtime;
|
||||
- enum Type {Dir, File};
|
||||
+ enum Type {Unknown=0, Dir=1, File=2};
|
||||
Type type;
|
||||
+ EntryInfo() :size(-1), mtime(0), type(Unknown) {}
|
||||
};
|
||||
|
||||
class SubStreamProvider {
|
||||
@@ -25,16 +26,18 @@
|
||||
StreamStatus status;
|
||||
std::string error;
|
||||
StreamBase<char> *input;
|
||||
+ StreamBase<char> *entrystream;
|
||||
EntryInfo entryinfo;
|
||||
public:
|
||||
- SubStreamProvider(StreamBase<char> *i) :status(Ok), input(i) {}
|
||||
- virtual ~SubStreamProvider() {}
|
||||
+ SubStreamProvider(StreamBase<char> *i) :status(Ok), input(i), entrystream(0)
|
||||
+ {}
|
||||
+ virtual ~SubStreamProvider() { if (entrystream) delete entrystream; }
|
||||
StreamStatus getStatus() const { return status; }
|
||||
virtual StreamBase<char>* nextEntry() = 0;
|
||||
+ StreamBase<char>* currentEntry() { return entrystream; }
|
||||
const EntryInfo &getEntryInfo() const {
|
||||
return entryinfo;
|
||||
}
|
||||
-// std::string getEntryFileName() const { return entryfilename; }
|
||||
const char* getError() const { return error.c_str(); }
|
||||
};
|
||||
|
@ -1,25 +0,0 @@
|
||||
--- src/CLucene/jstreams/tarinputstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/tarinputstream.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -28,7 +28,6 @@
|
||||
class TarInputStream : public SubStreamProvider {
|
||||
private:
|
||||
// information relating to the current entry
|
||||
- StreamBase<char> *output;
|
||||
int32_t numPaddingBytes;
|
||||
|
||||
void readFileName(int32_t len);
|
||||
@@ -37,10 +36,13 @@
|
||||
int32_t readOctalField(const char *b, int32_t offset);
|
||||
void readLongLink(const char *b);
|
||||
public:
|
||||
- TarInputStream(StreamBase<char> *input);
|
||||
+ explicit TarInputStream(StreamBase<char> *input);
|
||||
~TarInputStream();
|
||||
StreamBase<char>* nextEntry();
|
||||
static bool checkHeader(const char* data, int32_t datasize);
|
||||
+ static SubStreamProvider* factory(StreamBase<char>* input) {
|
||||
+ return new TarInputStream(input);
|
||||
+ }
|
||||
};
|
||||
|
||||
} // end namespace jstreams
|
@ -1,25 +0,0 @@
|
||||
--- src/CLucene/jstreams/zipinputstream.h Sat Feb 10 13:56:34 2007
|
||||
+++ src/CLucene/jstreams/zipinputstream.h.orig Fri Nov 24 13:42:02 2006
|
||||
@@ -27,7 +27,6 @@
|
||||
// information relating to the current entry
|
||||
StreamBase<char>* compressedEntryStream;
|
||||
GZipInputStream *uncompressionStream;
|
||||
- StreamBase<char>* uncompressedEntryStream;
|
||||
int32_t entryCompressedSize;
|
||||
int32_t compressionMethod;
|
||||
|
||||
@@ -36,10 +35,13 @@
|
||||
static int32_t read2bytes(const unsigned char *b);
|
||||
static int32_t read4bytes(const unsigned char *b);
|
||||
public:
|
||||
- ZipInputStream(StreamBase<char>* input);
|
||||
+ explicit ZipInputStream(StreamBase<char>* input);
|
||||
~ZipInputStream();
|
||||
StreamBase<char>* nextEntry();
|
||||
static bool checkHeader(const char* data, int32_t datasize);
|
||||
+ static SubStreamProvider* factory(StreamBase<char>* input) {
|
||||
+ return new ZipInputStream(input);
|
||||
+ }
|
||||
};
|
||||
|
||||
} // end namespace jstreams
|
@ -1,5 +0,0 @@
|
||||
CLucene is a C++ port of Lucene: the high-performance,
|
||||
full-featured text search engine written in Java.
|
||||
CLucene is faster than lucene as it is written in C++.
|
||||
|
||||
WWW: http://sourceforge.net/projects/clucene/
|
@ -1,80 +0,0 @@
|
||||
include/CLucene/analysis/PorterStemmer.h
|
||||
include/CLucene/analysis/cjk/CJKAnalyzer.h
|
||||
include/CLucene/highlighter/Encoder.h
|
||||
include/CLucene/highlighter/Formatter.h
|
||||
include/CLucene/highlighter/Fragmenter.h
|
||||
include/CLucene/highlighter/HighlightScorer.h
|
||||
include/CLucene/highlighter/Highlighter.h
|
||||
include/CLucene/highlighter/QueryScorer.h
|
||||
include/CLucene/highlighter/QueryTermExtractor.h
|
||||
include/CLucene/highlighter/Scorer.h
|
||||
include/CLucene/highlighter/SimpleFragmenter.h
|
||||
include/CLucene/highlighter/SimpleHTMLEncoder.h
|
||||
include/CLucene/highlighter/SimpleHTMLFormatter.h
|
||||
include/CLucene/highlighter/TextFragment.h
|
||||
include/CLucene/highlighter/TokenGroup.h
|
||||
include/CLucene/highlighter/TokenSources.h
|
||||
include/CLucene/highlighter/WeightedTerm.h
|
||||
include/CLucene/jstreams/Reader.h
|
||||
include/CLucene/jstreams/bufferedstream.h
|
||||
include/CLucene/jstreams/bz2inputstream.h
|
||||
include/CLucene/jstreams/dostime.h
|
||||
include/CLucene/jstreams/fileinputstream.h
|
||||
include/CLucene/jstreams/filereader.h
|
||||
include/CLucene/jstreams/gzipinputstream.h
|
||||
include/CLucene/jstreams/inputstream.h
|
||||
include/CLucene/jstreams/inputstreambuffer.h
|
||||
include/CLucene/jstreams/inputstreamreader.h
|
||||
include/CLucene/jstreams/jstreamsconfig.h
|
||||
include/CLucene/jstreams/streambase.h
|
||||
include/CLucene/jstreams/streamreader.h
|
||||
include/CLucene/jstreams/stringreader.h
|
||||
include/CLucene/jstreams/subinputstream.h
|
||||
include/CLucene/jstreams/substreamprovider.h
|
||||
include/CLucene/jstreams/tarinputstream.h
|
||||
include/CLucene/jstreams/zipinputstream.h
|
||||
include/CLucene/snowball/SnowballAnalyzer.h
|
||||
include/CLucene/snowball/SnowballFilter.h
|
||||
include/CLucene/snowball/include/libstemmer.h
|
||||
include/CLucene/snowball/libstemmer.h
|
||||
include/CLucene/snowball/libstemmer/modules.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_danish.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_dutch.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_english.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_finnish.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_french.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_german.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_italian.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_norwegian.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_porter.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_portuguese.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_spanish.h
|
||||
include/CLucene/snowball/libstemmer/stem_ISO_8859_1_swedish.h
|
||||
include/CLucene/snowball/libstemmer/stem_KOI8_R_russian.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_danish.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_dutch.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_english.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_finnish.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_french.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_german.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_italian.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_norwegian.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_porter.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_portuguese.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_russian.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_spanish.h
|
||||
include/CLucene/snowball/libstemmer/stem_UTF_8_swedish.h
|
||||
include/CLucene/snowball/runtime/api.h
|
||||
include/CLucene/snowball/runtime/header.h
|
||||
lib/CLucene/clucene-config-contrib.h
|
||||
lib/libclucene-contrib.a
|
||||
lib/libclucene-contrib.la
|
||||
lib/libclucene-contrib.so
|
||||
lib/libclucene-contrib.so.0
|
||||
@dirrm include/CLucene/snowball/runtime
|
||||
@dirrm include/CLucene/snowball/libstemmer
|
||||
@dirrm include/CLucene/snowball/include
|
||||
@dirrm include/CLucene/snowball
|
||||
@dirrm include/CLucene/jstreams
|
||||
@dirrm include/CLucene/highlighter
|
||||
@dirrm include/CLucene/analysis/cjk
|
@ -1,28 +1,25 @@
|
||||
# New ports collection makefile for: clucene
|
||||
# Date created: 2006-08-09
|
||||
# Whom: Cheng-Lung Sung <clsung@FreeBSD.org>
|
||||
#
|
||||
# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= clucene
|
||||
PORTVERSION= 0.9.21
|
||||
PORTVERSION= 2.3.3.4
|
||||
CATEGORIES= textproc
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-core-stable/${PORTVERSION}
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-core-unstable/2.3
|
||||
DISTNAME= ${PORTNAME}-core-${PORTVERSION}
|
||||
|
||||
MAINTAINER= clsung@FreeBSD.org
|
||||
MAINTAINER= office@FreeBSD.org
|
||||
COMMENT= CLucene is a C++ port of Lucene
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
LICENSE= AL2 LGPL21
|
||||
LICENSE_COMB= dual
|
||||
|
||||
BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
|
||||
|
||||
USE_CMAKE= yes
|
||||
USE_ICONV= yes
|
||||
USE_LDCONFIG= yes
|
||||
USE_AUTOTOOLS= libtool
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
CMAKE_ARGS= -DBUILD_CONTRIBS_LIB=ON
|
||||
CXXFLAGS+= -D__LONG_LONG_SUPPORTED
|
||||
|
||||
.if defined(WITH_ASCII_SUPPORT)
|
||||
CONFIGURE_ARGS+= --enable-ascii
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (clucene-core-0.9.21.tar.bz2) = ef9af373ea953362e42c9a3bdcbf8ef317bca4a407ffab9fe36c1b2807680630
|
||||
SIZE (clucene-core-0.9.21.tar.bz2) = 1530020
|
||||
SHA256 (clucene-core-2.3.3.4.tar.gz) = ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
|
||||
SIZE (clucene-core-2.3.3.4.tar.gz) = 2241498
|
||||
|
11
textproc/clucene/files/patch-CMakeLists.txt
Normal file
11
textproc/clucene/files/patch-CMakeLists.txt
Normal file
@ -0,0 +1,11 @@
|
||||
--- CMakeLists.txt.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ CMakeLists.txt 2012-08-07 16:27:55.000000000 -0400
|
||||
@@ -163,7 +163,7 @@
|
||||
SET(BUILD_CONTRIBS_LIB 1)
|
||||
ENDIF ( BUILD_CONTRIBS )
|
||||
IF ( BUILD_CONTRIBS_LIB )
|
||||
- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
|
||||
+ ADD_SUBDIRECTORY (src/contribs-lib)
|
||||
ENDIF ( BUILD_CONTRIBS_LIB )
|
||||
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- src/contribs-lib/CLucene/analysis/de/GermanStemmer.cpp.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/contribs-lib/CLucene/analysis/de/GermanStemmer.cpp 2013-01-08 17:03:27.000000000 -0500
|
||||
@@ -144,7 +144,7 @@
|
||||
{
|
||||
buffer.setCharAt( i, _T('$') );
|
||||
buffer.deleteChars( i + 1, i + 3 );
|
||||
- substCount =+ 2;
|
||||
+ substCount += 2;
|
||||
}
|
||||
else if ( c == _T('c') && buffer.charAt( i + 1 ) == _T('h') ) {
|
||||
buffer.setCharAt( i, 0xa7 ); // section sign in UTF-16
|
@ -0,0 +1,29 @@
|
||||
--- src/contribs-lib/CMakeLists.txt.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/contribs-lib/CMakeLists.txt 2012-08-07 16:27:55.000000000 -0400
|
||||
@@ -106,9 +106,26 @@
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
|
||||
|
||||
+#install public headers.
|
||||
+FOREACH(file ${HEADERS})
|
||||
+ get_filename_component(apath ${file} PATH)
|
||||
+ get_filename_component(aname ${file} NAME)
|
||||
+ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
|
||||
+ IF ( NOT aname MATCHES "^_.*" )
|
||||
+ install(FILES ${file}
|
||||
+ DESTINATION include/${relpath}
|
||||
+ COMPONENT development)
|
||||
+ ENDIF ( NOT aname MATCHES "^_.*" )
|
||||
+ENDFOREACH(file)
|
||||
+
|
||||
#set properties on the libraries
|
||||
SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
|
||||
VERSION ${CLUCENE_VERSION}
|
||||
SOVERSION ${CLUCENE_SOVERSION}
|
||||
COMPILE_DEFINITIONS_DEBUG _DEBUG
|
||||
)
|
||||
+
|
||||
+#and install library
|
||||
+install(TARGETS clucene-contribs-lib
|
||||
+ DESTINATION ${LIB_DESTINATION}
|
||||
+ COMPONENT runtime )
|
@ -0,0 +1,11 @@
|
||||
--- src/core/CLucene/index/DocumentsWriter.cpp.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/core/CLucene/index/DocumentsWriter.cpp 2012-08-07 17:23:51.000000000 -0400
|
||||
@@ -125,7 +125,7 @@
|
||||
if (this->postingsFreeListDW.values){
|
||||
if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
|
||||
memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
|
||||
- , NULL
|
||||
+ , 0
|
||||
, sizeof(Posting*));
|
||||
}
|
||||
postingsFreeListDW.deleteUntilNULL();
|
@ -0,0 +1,19 @@
|
||||
--- src/core/CLucene/util/VoidMap.h.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/core/CLucene/util/VoidMap.h 2013-01-08 17:37:43.000000000 -0500
|
||||
@@ -83,7 +83,7 @@
|
||||
_vt get( _kt k) const {
|
||||
const_iterator itr = base::find(k);
|
||||
if ( itr==base::end() )
|
||||
- return (_vt)NULL;
|
||||
+ return static_cast<_vt>(0);
|
||||
else
|
||||
return itr->second;
|
||||
}
|
||||
@@ -316,6 +316,7 @@
|
||||
if ( _this::dk || _this::dv )
|
||||
_this::remove(k);
|
||||
|
||||
+ (*this)[k] = v;;
|
||||
}
|
||||
};
|
||||
|
28
textproc/clucene/files/patch-src__core__CMakeLists.txt
Normal file
28
textproc/clucene/files/patch-src__core__CMakeLists.txt
Normal file
@ -0,0 +1,28 @@
|
||||
--- src/core/CMakeLists.txt.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/core/CMakeLists.txt 2012-08-07 14:12:31.000000000 -0400
|
||||
@@ -252,13 +252,13 @@
|
||||
set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
|
||||
")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
|
||||
- DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
|
||||
+ DESTINATION ${LIB_DESTINATION}/CLucene)
|
||||
|
||||
# install pkg-config file
|
||||
IF(NOT WIN32)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libclucene-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc @ONLY)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc
|
||||
- DESTINATION ${LIB_DESTINATION}/pkgconfig )
|
||||
+ DESTINATION libdata/pkgconfig )
|
||||
ENDIF(NOT WIN32)
|
||||
|
||||
|
||||
@@ -274,9 +274,6 @@
|
||||
install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h
|
||||
DESTINATION include/CLucene
|
||||
COMPONENT development)
|
||||
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake
|
||||
- DESTINATION include/CLucene
|
||||
- COMPONENT development)
|
||||
ENDIF ( LUCENE_SYS_INCLUDES )
|
||||
|
||||
|
11
textproc/clucene/files/patch-src__shared__CMakeLists.txt
Normal file
11
textproc/clucene/files/patch-src__shared__CMakeLists.txt
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/shared/CMakeLists.txt.orig 2011-03-16 20:21:07.000000000 -0400
|
||||
+++ src/shared/CMakeLists.txt 2012-08-07 13:31:00.000000000 -0400
|
||||
@@ -62,7 +62,7 @@
|
||||
stdint.h unistd.h io.h direct.h sys/dir.h sys/ndir.h dirent.h wctype.h fcntl.h
|
||||
stat.h sys/stat.h stdexcept errno.h fcntl.h windef.h windows.h wchar.h
|
||||
hash_map hash_set ext/hash_map ext/hash_map tr1/unordered_set tr1/unordered_map
|
||||
- sys/timeb.h tchar.h strings.h stdexcept sys/mman.h winerror.h )
|
||||
+ tchar.h strings.h stdexcept sys/mman.h winerror.h )
|
||||
|
||||
|
||||
########################################################################
|
@ -1,146 +1,395 @@
|
||||
include/CLucene.h
|
||||
include/CLucene/CLBackwards.h
|
||||
include/CLucene/CLConfig.h
|
||||
include/CLucene/LuceneThreads.h
|
||||
include/CLucene/SharedHeader.h
|
||||
include/CLucene/StdHeader.h
|
||||
include/CLucene/analysis/AnalysisHeader.h
|
||||
include/CLucene/analysis/Analyzers.h
|
||||
include/CLucene/analysis/CachingTokenFilter.h
|
||||
include/CLucene/analysis/LanguageBasedAnalyzer.h
|
||||
include/CLucene/analysis/PorterStemmer.h
|
||||
include/CLucene/analysis/cjk/CJKAnalyzer.h
|
||||
include/CLucene/analysis/de/GermanAnalyzer.h
|
||||
include/CLucene/analysis/de/GermanStemFilter.h
|
||||
include/CLucene/analysis/de/GermanStemmer.h
|
||||
include/CLucene/analysis/standard/StandardAnalyzer.h
|
||||
include/CLucene/analysis/standard/StandardFilter.h
|
||||
include/CLucene/analysis/standard/StandardTokenizer.h
|
||||
include/CLucene/analysis/standard/StandardTokenizerConstants.h
|
||||
include/CLucene/config/CompilerBcb.h
|
||||
include/CLucene/config/CompilerGcc.h
|
||||
include/CLucene/config/CompilerMsvc.h
|
||||
include/CLucene/config/PlatformMac.h
|
||||
include/CLucene/config/PlatformUnix.h
|
||||
include/CLucene/config/PlatformWin32.h
|
||||
include/CLucene/config/compiler.h
|
||||
include/CLucene/config/define_std.h
|
||||
include/CLucene/config/gunichartables.h
|
||||
include/CLucene/config/repl_tchar.h
|
||||
include/CLucene/config/repl_wchar.h
|
||||
include/CLucene/config/threadCSection.h
|
||||
include/CLucene/config/threadPthread.h
|
||||
include/CLucene/debug/condition.h
|
||||
include/CLucene/clucene-config.h
|
||||
include/CLucene/debug/error.h
|
||||
include/CLucene/debug/lucenebase.h
|
||||
include/CLucene/debug/mem.h
|
||||
include/CLucene/document/DateField.h
|
||||
include/CLucene/document/DateTools.h
|
||||
include/CLucene/document/Document.h
|
||||
include/CLucene/document/Field.h
|
||||
include/CLucene/index/CompoundFile.h
|
||||
include/CLucene/index/DocumentWriter.h
|
||||
include/CLucene/index/FieldInfo.h
|
||||
include/CLucene/index/FieldInfos.h
|
||||
include/CLucene/index/FieldsReader.h
|
||||
include/CLucene/index/FieldsWriter.h
|
||||
include/CLucene/document/FieldSelector.h
|
||||
include/CLucene/document/NumberTools.h
|
||||
include/CLucene/ext/boost/assert.hpp
|
||||
include/CLucene/ext/boost/checked_delete.hpp
|
||||
include/CLucene/ext/boost/config.hpp
|
||||
include/CLucene/ext/boost/config/abi/borland_prefix.hpp
|
||||
include/CLucene/ext/boost/config/abi/borland_suffix.hpp
|
||||
include/CLucene/ext/boost/config/abi/msvc_prefix.hpp
|
||||
include/CLucene/ext/boost/config/abi/msvc_suffix.hpp
|
||||
include/CLucene/ext/boost/config/abi_prefix.hpp
|
||||
include/CLucene/ext/boost/config/abi_suffix.hpp
|
||||
include/CLucene/ext/boost/config/auto_link.hpp
|
||||
include/CLucene/ext/boost/config/compiler/borland.hpp
|
||||
include/CLucene/ext/boost/config/compiler/codegear.hpp
|
||||
include/CLucene/ext/boost/config/compiler/comeau.hpp
|
||||
include/CLucene/ext/boost/config/compiler/common_edg.hpp
|
||||
include/CLucene/ext/boost/config/compiler/compaq_cxx.hpp
|
||||
include/CLucene/ext/boost/config/compiler/digitalmars.hpp
|
||||
include/CLucene/ext/boost/config/compiler/gcc.hpp
|
||||
include/CLucene/ext/boost/config/compiler/gcc_xml.hpp
|
||||
include/CLucene/ext/boost/config/compiler/greenhills.hpp
|
||||
include/CLucene/ext/boost/config/compiler/hp_acc.hpp
|
||||
include/CLucene/ext/boost/config/compiler/intel.hpp
|
||||
include/CLucene/ext/boost/config/compiler/kai.hpp
|
||||
include/CLucene/ext/boost/config/compiler/metrowerks.hpp
|
||||
include/CLucene/ext/boost/config/compiler/mpw.hpp
|
||||
include/CLucene/ext/boost/config/compiler/pgi.hpp
|
||||
include/CLucene/ext/boost/config/compiler/sgi_mipspro.hpp
|
||||
include/CLucene/ext/boost/config/compiler/sunpro_cc.hpp
|
||||
include/CLucene/ext/boost/config/compiler/vacpp.hpp
|
||||
include/CLucene/ext/boost/config/compiler/visualc.hpp
|
||||
include/CLucene/ext/boost/config/no_tr1/cmath.hpp
|
||||
include/CLucene/ext/boost/config/no_tr1/complex.hpp
|
||||
include/CLucene/ext/boost/config/no_tr1/functional.hpp
|
||||
include/CLucene/ext/boost/config/no_tr1/memory.hpp
|
||||
include/CLucene/ext/boost/config/no_tr1/utility.hpp
|
||||
include/CLucene/ext/boost/config/platform/aix.hpp
|
||||
include/CLucene/ext/boost/config/platform/amigaos.hpp
|
||||
include/CLucene/ext/boost/config/platform/beos.hpp
|
||||
include/CLucene/ext/boost/config/platform/bsd.hpp
|
||||
include/CLucene/ext/boost/config/platform/cygwin.hpp
|
||||
include/CLucene/ext/boost/config/platform/hpux.hpp
|
||||
include/CLucene/ext/boost/config/platform/irix.hpp
|
||||
include/CLucene/ext/boost/config/platform/linux.hpp
|
||||
include/CLucene/ext/boost/config/platform/macos.hpp
|
||||
include/CLucene/ext/boost/config/platform/qnxnto.hpp
|
||||
include/CLucene/ext/boost/config/platform/solaris.hpp
|
||||
include/CLucene/ext/boost/config/platform/vxworks.hpp
|
||||
include/CLucene/ext/boost/config/platform/win32.hpp
|
||||
include/CLucene/ext/boost/config/posix_features.hpp
|
||||
include/CLucene/ext/boost/config/requires_threads.hpp
|
||||
include/CLucene/ext/boost/config/select_compiler_config.hpp
|
||||
include/CLucene/ext/boost/config/select_platform_config.hpp
|
||||
include/CLucene/ext/boost/config/select_stdlib_config.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/dinkumware.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/libcomo.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/libstdcpp3.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/modena.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/msl.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/roguewave.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/sgi.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/stlport.hpp
|
||||
include/CLucene/ext/boost/config/stdlib/vacpp.hpp
|
||||
include/CLucene/ext/boost/config/suffix.hpp
|
||||
include/CLucene/ext/boost/config/user.hpp
|
||||
include/CLucene/ext/boost/config/warning_disable.hpp
|
||||
include/CLucene/ext/boost/current_function.hpp
|
||||
include/CLucene/ext/boost/detail/algorithm.hpp
|
||||
include/CLucene/ext/boost/detail/allocator_utilities.hpp
|
||||
include/CLucene/ext/boost/detail/atomic_count.hpp
|
||||
include/CLucene/ext/boost/detail/binary_search.hpp
|
||||
include/CLucene/ext/boost/detail/call_traits.hpp
|
||||
include/CLucene/ext/boost/detail/catch_exceptions.hpp
|
||||
include/CLucene/ext/boost/detail/compressed_pair.hpp
|
||||
include/CLucene/ext/boost/detail/container_fwd.hpp
|
||||
include/CLucene/ext/boost/detail/dynamic_bitset.hpp
|
||||
include/CLucene/ext/boost/detail/endian.hpp
|
||||
include/CLucene/ext/boost/detail/has_default_constructor.hpp
|
||||
include/CLucene/ext/boost/detail/identifier.hpp
|
||||
include/CLucene/ext/boost/detail/indirect_traits.hpp
|
||||
include/CLucene/ext/boost/detail/interlocked.hpp
|
||||
include/CLucene/ext/boost/detail/is_function_ref_tester.hpp
|
||||
include/CLucene/ext/boost/detail/is_incrementable.hpp
|
||||
include/CLucene/ext/boost/detail/is_xxx.hpp
|
||||
include/CLucene/ext/boost/detail/iterator.hpp
|
||||
include/CLucene/ext/boost/detail/lcast_precision.hpp
|
||||
include/CLucene/ext/boost/detail/lightweight_mutex.hpp
|
||||
include/CLucene/ext/boost/detail/lightweight_test.hpp
|
||||
include/CLucene/ext/boost/detail/lightweight_thread.hpp
|
||||
include/CLucene/ext/boost/detail/limits.hpp
|
||||
include/CLucene/ext/boost/detail/named_template_params.hpp
|
||||
include/CLucene/ext/boost/detail/no_exceptions_support.hpp
|
||||
include/CLucene/ext/boost/detail/none_t.hpp
|
||||
include/CLucene/ext/boost/detail/numeric_traits.hpp
|
||||
include/CLucene/ext/boost/detail/ob_call_traits.hpp
|
||||
include/CLucene/ext/boost/detail/ob_compressed_pair.hpp
|
||||
include/CLucene/ext/boost/detail/quick_allocator.hpp
|
||||
include/CLucene/ext/boost/detail/reference_content.hpp
|
||||
include/CLucene/ext/boost/detail/scoped_enum_emulation.hpp
|
||||
include/CLucene/ext/boost/detail/select_type.hpp
|
||||
include/CLucene/ext/boost/detail/sp_typeinfo.hpp
|
||||
include/CLucene/ext/boost/detail/templated_streams.hpp
|
||||
include/CLucene/ext/boost/detail/utf8_codecvt_facet.hpp
|
||||
include/CLucene/ext/boost/detail/workaround.hpp
|
||||
include/CLucene/ext/boost/exception/all.hpp
|
||||
include/CLucene/ext/boost/exception/current_exception_cast.hpp
|
||||
include/CLucene/ext/boost/exception/detail/attribute_noreturn.hpp
|
||||
include/CLucene/ext/boost/exception/detail/error_info_impl.hpp
|
||||
include/CLucene/ext/boost/exception/detail/exception_ptr.hpp
|
||||
include/CLucene/ext/boost/exception/detail/is_output_streamable.hpp
|
||||
include/CLucene/ext/boost/exception/detail/object_hex_dump.hpp
|
||||
include/CLucene/ext/boost/exception/detail/type_info.hpp
|
||||
include/CLucene/ext/boost/exception/diagnostic_information.hpp
|
||||
include/CLucene/ext/boost/exception/enable_current_exception.hpp
|
||||
include/CLucene/ext/boost/exception/enable_error_info.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_api_function.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_at_line.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_errno.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_file_handle.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_file_name.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_file_open_mode.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_nested_exception.hpp
|
||||
include/CLucene/ext/boost/exception/errinfo_type_info_name.hpp
|
||||
include/CLucene/ext/boost/exception/error_info.hpp
|
||||
include/CLucene/ext/boost/exception/exception.hpp
|
||||
include/CLucene/ext/boost/exception/get_error_info.hpp
|
||||
include/CLucene/ext/boost/exception/info.hpp
|
||||
include/CLucene/ext/boost/exception/info_tuple.hpp
|
||||
include/CLucene/ext/boost/exception/to_string.hpp
|
||||
include/CLucene/ext/boost/exception/to_string_stub.hpp
|
||||
include/CLucene/ext/boost/memory_order.hpp
|
||||
include/CLucene/ext/boost/shared_ptr.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/bad_weak_ptr.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_gcc.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_pthreads.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_solaris.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_sync.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/atomic_count_win32.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/lightweight_mutex.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/lwm_nop.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/lwm_pthreads.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/lwm_win32_cs.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/operator_bool.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/quick_allocator.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/shared_array_nmt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/shared_count.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/shared_ptr_nmt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_convertible.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_base_w32.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_counted_impl.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/sp_has_sync.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_nt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_pool.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_pt.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_sync.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/spinlock_w32.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/detail/yield_k.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/enable_shared_from_this.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/enable_shared_from_this2.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/intrusive_ptr.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/make_shared.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/scoped_array.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/scoped_ptr.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/shared_array.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/shared_ptr.hpp
|
||||
include/CLucene/ext/boost/smart_ptr/weak_ptr.hpp
|
||||
include/CLucene/ext/boost/throw_exception.hpp
|
||||
include/CLucene/ext/boost/version.hpp
|
||||
include/CLucene/highlighter/Encoder.h
|
||||
include/CLucene/highlighter/Formatter.h
|
||||
include/CLucene/highlighter/Fragmenter.h
|
||||
include/CLucene/highlighter/HighlightScorer.h
|
||||
include/CLucene/highlighter/Highlighter.h
|
||||
include/CLucene/highlighter/QueryScorer.h
|
||||
include/CLucene/highlighter/QueryTermExtractor.h
|
||||
include/CLucene/highlighter/Scorer.h
|
||||
include/CLucene/highlighter/SimpleFragmenter.h
|
||||
include/CLucene/highlighter/SimpleHTMLEncoder.h
|
||||
include/CLucene/highlighter/SimpleHTMLFormatter.h
|
||||
include/CLucene/highlighter/TextFragment.h
|
||||
include/CLucene/highlighter/TokenGroup.h
|
||||
include/CLucene/highlighter/TokenSources.h
|
||||
include/CLucene/highlighter/WeightedTerm.h
|
||||
include/CLucene/index/DirectoryIndexReader.h
|
||||
include/CLucene/index/IndexDeletionPolicy.h
|
||||
include/CLucene/index/IndexModifier.h
|
||||
include/CLucene/index/IndexReader.h
|
||||
include/CLucene/index/IndexWriter.h
|
||||
include/CLucene/index/MergePolicy.h
|
||||
include/CLucene/index/MergeScheduler.h
|
||||
include/CLucene/index/MultiReader.h
|
||||
include/CLucene/index/SegmentHeader.h
|
||||
include/CLucene/index/SegmentInfos.h
|
||||
include/CLucene/index/SegmentMergeInfo.h
|
||||
include/CLucene/index/SegmentMergeQueue.h
|
||||
include/CLucene/index/SegmentMerger.h
|
||||
include/CLucene/index/SegmentTermEnum.h
|
||||
include/CLucene/index/MultipleTermPositions.h
|
||||
include/CLucene/index/Payload.h
|
||||
include/CLucene/index/Term.h
|
||||
include/CLucene/index/TermInfo.h
|
||||
include/CLucene/index/TermInfosReader.h
|
||||
include/CLucene/index/TermInfosWriter.h
|
||||
include/CLucene/index/TermVector.h
|
||||
include/CLucene/index/Terms.h
|
||||
include/CLucene/queryParser/Lexer.h
|
||||
include/CLucene/queryParser/MultiFieldQueryParser.h
|
||||
include/CLucene/queryParser/QueryParser.h
|
||||
include/CLucene/queryParser/QueryParserBase.h
|
||||
include/CLucene/queryParser/QueryParserConstants.h
|
||||
include/CLucene/queryParser/QueryParserTokenManager.h
|
||||
include/CLucene/queryParser/QueryToken.h
|
||||
include/CLucene/queryParser/TokenList.h
|
||||
include/CLucene/queryParser/legacy/MultiFieldQueryParser.h
|
||||
include/CLucene/queryParser/legacy/QueryParser.h
|
||||
include/CLucene/queryParser/legacy/QueryToken.h
|
||||
include/CLucene/search/BooleanClause.h
|
||||
include/CLucene/search/BooleanQuery.h
|
||||
include/CLucene/search/BooleanScorer.h
|
||||
include/CLucene/search/CachingSpanFilter.h
|
||||
include/CLucene/search/CachingWrapperFilter.h
|
||||
include/CLucene/search/ChainedFilter.h
|
||||
include/CLucene/search/Compare.h
|
||||
include/CLucene/search/ConjunctionScorer.h
|
||||
include/CLucene/search/ConstantScoreQuery.h
|
||||
include/CLucene/search/DateFilter.h
|
||||
include/CLucene/search/ExactPhraseScorer.h
|
||||
include/CLucene/search/Explanation.h
|
||||
include/CLucene/search/FieldCache.h
|
||||
include/CLucene/search/FieldCacheImpl.h
|
||||
include/CLucene/search/FieldDoc.h
|
||||
include/CLucene/search/FieldDocSortedHitQueue.h
|
||||
include/CLucene/search/FieldSortedHitQueue.h
|
||||
include/CLucene/search/Filter.h
|
||||
include/CLucene/search/FilterResultCache.h
|
||||
include/CLucene/search/FilteredTermEnum.h
|
||||
include/CLucene/search/FuzzyQuery.h
|
||||
include/CLucene/search/HitQueue.h
|
||||
include/CLucene/search/Hits.h
|
||||
include/CLucene/search/IndexSearcher.h
|
||||
include/CLucene/search/MatchAllDocsQuery.h
|
||||
include/CLucene/search/MultiPhraseQuery.h
|
||||
include/CLucene/search/MultiSearcher.h
|
||||
include/CLucene/search/MultiTermQuery.h
|
||||
include/CLucene/search/PhrasePositions.h
|
||||
include/CLucene/search/PhraseQuery.h
|
||||
include/CLucene/search/PhraseQueue.h
|
||||
include/CLucene/search/PhraseScorer.h
|
||||
include/CLucene/search/PrefixQuery.h
|
||||
include/CLucene/search/Query.h
|
||||
include/CLucene/search/QueryFilter.h
|
||||
include/CLucene/search/RangeFilter.h
|
||||
include/CLucene/search/RangeQuery.h
|
||||
include/CLucene/search/Scorer.h
|
||||
include/CLucene/search/ScorerDocQueue.h
|
||||
include/CLucene/search/SearchHeader.h
|
||||
include/CLucene/search/Searchable.h
|
||||
include/CLucene/search/Similarity.h
|
||||
include/CLucene/search/SloppyPhraseScorer.h
|
||||
include/CLucene/search/Sort.h
|
||||
include/CLucene/search/SpanFilter.h
|
||||
include/CLucene/search/SpanFilterResult.h
|
||||
include/CLucene/search/SpanQueryFilter.h
|
||||
include/CLucene/search/TermQuery.h
|
||||
include/CLucene/search/TermScorer.h
|
||||
include/CLucene/search/WildcardQuery.h
|
||||
include/CLucene/search/WildcardTermEnum.h
|
||||
include/CLucene/search/spans/SpanFirstQuery.h
|
||||
include/CLucene/search/spans/SpanNearQuery.h
|
||||
include/CLucene/search/spans/SpanNotQuery.h
|
||||
include/CLucene/search/spans/SpanOrQuery.h
|
||||
include/CLucene/search/spans/SpanQuery.h
|
||||
include/CLucene/search/spans/SpanScorer.h
|
||||
include/CLucene/search/spans/SpanTermQuery.h
|
||||
include/CLucene/search/spans/SpanWeight.h
|
||||
include/CLucene/search/spans/Spans.h
|
||||
include/CLucene/snowball/SnowballAnalyzer.h
|
||||
include/CLucene/snowball/SnowballFilter.h
|
||||
include/CLucene/snowball/include/libstemmer.h
|
||||
include/CLucene/snowball/libstemmer.h
|
||||
include/CLucene/snowball/libstemmer/modules.h
|
||||
include/CLucene/snowball/runtime/api.h
|
||||
include/CLucene/snowball/runtime/header.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_danish.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_dutch.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_english.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_finnish.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_french.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_german.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_italian.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_porter.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_spanish.h
|
||||
include/CLucene/snowball/src_c/stem_ISO_8859_1_swedish.h
|
||||
include/CLucene/snowball/src_c/stem_KOI8_R_russian.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_danish.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_dutch.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_english.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_finnish.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_french.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_german.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_italian.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_norwegian.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_porter.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_portuguese.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_russian.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_spanish.h
|
||||
include/CLucene/snowball/src_c/stem_UTF_8_swedish.h
|
||||
include/CLucene/store/Directory.h
|
||||
include/CLucene/store/FSDirectory.h
|
||||
include/CLucene/store/IndexInput.h
|
||||
include/CLucene/store/IndexOutput.h
|
||||
include/CLucene/store/InputStream.h
|
||||
include/CLucene/store/Lock.h
|
||||
include/CLucene/store/OutputStream.h
|
||||
include/CLucene/store/LockFactory.h
|
||||
include/CLucene/store/RAMDirectory.h
|
||||
include/CLucene/store/TransactionalRAMDirectory.h
|
||||
include/CLucene/util/Arrays.h
|
||||
include/CLucene/util/Array.h
|
||||
include/CLucene/util/BitSet.h
|
||||
include/CLucene/util/CLStreams.h
|
||||
include/CLucene/util/Equators.h
|
||||
include/CLucene/util/FastCharStream.h
|
||||
include/CLucene/util/MD5Digester.h
|
||||
include/CLucene/util/Misc.h
|
||||
include/CLucene/util/PriorityQueue.h
|
||||
include/CLucene/util/Reader.h
|
||||
include/CLucene/util/StringBuffer.h
|
||||
include/CLucene/util/StringIntern.h
|
||||
include/CLucene/util/ThreadLocal.h
|
||||
include/CLucene/util/VoidList.h
|
||||
include/CLucene/util/VoidMap.h
|
||||
include/CLucene/util/bufferedstream.h
|
||||
include/CLucene/util/dirent.h
|
||||
include/CLucene/util/fileinputstream.h
|
||||
include/CLucene/util/googlesparsemap.h
|
||||
include/CLucene/util/inputstreambuffer.h
|
||||
include/CLucene/util/jstreamsconfig.h
|
||||
include/CLucene/util/streambase.h
|
||||
include/CLucene/util/stringreader.h
|
||||
include/CLucene/util/subinputstream.h
|
||||
lib/CLucene/clucene-config.h
|
||||
lib/libclucene.a
|
||||
lib/libclucene.la
|
||||
lib/libclucene.so
|
||||
lib/libclucene.so.0
|
||||
@dirrmtry lib/CLucene
|
||||
@dirrmtry include/CLucene/util
|
||||
@dirrmtry include/CLucene/store
|
||||
@dirrmtry include/CLucene/search
|
||||
@dirrmtry include/CLucene/queryParser
|
||||
@dirrmtry include/CLucene/index
|
||||
@dirrmtry include/CLucene/document
|
||||
@dirrmtry include/CLucene/debug
|
||||
@dirrmtry include/CLucene/config
|
||||
@dirrmtry include/CLucene/analysis/standard
|
||||
@dirrmtry include/CLucene/analysis
|
||||
@dirrmtry include/CLucene
|
||||
include/CLucene/util/arrayinputstream.h
|
||||
include/CLucene/util/byteinputstream.h
|
||||
include/CLucene/util/gzipcompressstream.h
|
||||
include/CLucene/util/gzipinputstream.h
|
||||
include/CLucene/util/streamarray.h
|
||||
lib/CLucene/CLuceneConfig.cmake
|
||||
lib/libclucene-contribs-lib.so
|
||||
lib/libclucene-contribs-lib.so.1
|
||||
lib/libclucene-contribs-lib.so.2.3.3.4
|
||||
lib/libclucene-core.so
|
||||
lib/libclucene-core.so.1
|
||||
lib/libclucene-core.so.2.3.3.4
|
||||
lib/libclucene-shared.so
|
||||
lib/libclucene-shared.so.1
|
||||
lib/libclucene-shared.so.2.3.3.4
|
||||
libdata/pkgconfig/libclucene-core.pc
|
||||
@dirrm lib/CLucene
|
||||
@dirrm include/CLucene/util
|
||||
@dirrm include/CLucene/store
|
||||
@dirrm include/CLucene/snowball/src_c
|
||||
@dirrm include/CLucene/snowball/runtime
|
||||
@dirrm include/CLucene/snowball/libstemmer
|
||||
@dirrm include/CLucene/snowball/include
|
||||
@dirrm include/CLucene/snowball
|
||||
@dirrm include/CLucene/search/spans
|
||||
@dirrm include/CLucene/search
|
||||
@dirrm include/CLucene/queryParser/legacy
|
||||
@dirrm include/CLucene/queryParser
|
||||
@dirrm include/CLucene/index
|
||||
@dirrm include/CLucene/highlighter
|
||||
@dirrm include/CLucene/ext/boost/smart_ptr/detail
|
||||
@dirrm include/CLucene/ext/boost/smart_ptr
|
||||
@dirrm include/CLucene/ext/boost/exception/detail
|
||||
@dirrm include/CLucene/ext/boost/exception
|
||||
@dirrm include/CLucene/ext/boost/detail
|
||||
@dirrm include/CLucene/ext/boost/config/stdlib
|
||||
@dirrm include/CLucene/ext/boost/config/platform
|
||||
@dirrm include/CLucene/ext/boost/config/no_tr1
|
||||
@dirrm include/CLucene/ext/boost/config/compiler
|
||||
@dirrm include/CLucene/ext/boost/config/abi
|
||||
@dirrm include/CLucene/ext/boost/config
|
||||
@dirrm include/CLucene/ext/boost
|
||||
@dirrm include/CLucene/ext
|
||||
@dirrm include/CLucene/document
|
||||
@dirrm include/CLucene/debug
|
||||
@dirrm include/CLucene/analysis/standard
|
||||
@dirrm include/CLucene/analysis/de
|
||||
@dirrm include/CLucene/analysis/cjk
|
||||
@dirrm include/CLucene/analysis
|
||||
@dirrm include/CLucene
|
||||
|
@ -1,9 +1,5 @@
|
||||
# New ports collection makefile for: textproc/p5-Lucene
|
||||
# Date created: 20 Feb 2007
|
||||
# Whom: Cheng-Lung Sung <clsung@FreeBSD.org>
|
||||
#
|
||||
# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= Lucene
|
||||
PORTVERSION= 0.18
|
||||
@ -15,7 +11,9 @@ PKGNAMEPREFIX= p5-
|
||||
MAINTAINER= perl@FreeBSD.org
|
||||
COMMENT= API to the C++ port of the Lucene search engine
|
||||
|
||||
LIB_DEPENDS= clucene:${PORTSDIR}/textproc/clucene
|
||||
LIB_DEPENDS= clucene-core:${PORTSDIR}/textproc/clucene
|
||||
|
||||
BROKEN= incompatible with CLucene 2.3
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
CC= ${CXX}
|
||||
|
Loading…
Reference in New Issue
Block a user