restore the original system_clucene patch
The new version has some required hunks removed without replacement.
This commit is contained in:
parent
8b62f2f75e
commit
dca9ac499b
@ -1,8 +1,7 @@
|
|||||||
diff --git a/src/assistant/clucene/fulltextsearch.pri b/src/assistant/clucene/fulltextsearch.pri
|
diff -up qttools-opensource-src-5.1.1/src/assistant/clucene/fulltextsearch.pri.system_clucene qttools-opensource-src-5.1.1/src/assistant/clucene/fulltextsearch.pri
|
||||||
index eebfba3..2df909d 100644
|
--- qttools-opensource-src-5.1.1/src/assistant/clucene/fulltextsearch.pri.system_clucene 2013-08-25 13:04:37.000000000 -0500
|
||||||
--- a/src/assistant/clucene/fulltextsearch.pri
|
+++ qttools-opensource-src-5.1.1/src/assistant/clucene/fulltextsearch.pri 2013-08-28 15:25:53.129091331 -0500
|
||||||
+++ b/src/assistant/clucene/fulltextsearch.pri
|
@@ -1,125 +1,8 @@
|
||||||
@@ -1,125 +1,7 @@
|
|
||||||
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
|
-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
|
||||||
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
|
-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
|
||||||
-
|
-
|
||||||
@ -124,7 +123,7 @@ index eebfba3..2df909d 100644
|
|||||||
- $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
|
- $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
|
||||||
- $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
|
- $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
|
||||||
- $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
|
- $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
|
||||||
-
|
|
||||||
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
|
+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
|
||||||
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
|
+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
|
||||||
+DEFINES += LUCENE_ENABLE_REFCOUNT
|
+DEFINES += LUCENE_ENABLE_REFCOUNT
|
||||||
@ -132,3 +131,94 @@ index eebfba3..2df909d 100644
|
|||||||
|
|
||||||
#Header files
|
#Header files
|
||||||
HEADERS += qclucene_global_p.h \
|
HEADERS += qclucene_global_p.h \
|
||||||
|
diff -up qttools-opensource-src-5.1.1/src/assistant/clucene/qindexreader.cpp.system_clucene qttools-opensource-src-5.1.1/src/assistant/clucene/qindexreader.cpp
|
||||||
|
--- qttools-opensource-src-5.1.1/src/assistant/clucene/qindexreader.cpp.system_clucene 2013-08-25 13:04:37.000000000 -0500
|
||||||
|
+++ qttools-opensource-src-5.1.1/src/assistant/clucene/qindexreader.cpp 2013-08-28 19:56:42.258339038 -0500
|
||||||
|
@@ -59,13 +59,13 @@ bool QCLuceneIndexReader::isLuceneFile(c
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
|
||||||
|
- return IndexReader::isLuceneFile(filename);
|
||||||
|
+ return IndexReader::isLuceneFile(filename.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QCLuceneIndexReader::indexExists(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return IndexReader::indexExists(directory);
|
||||||
|
+ return IndexReader::indexExists(directory.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
|
||||||
|
@@ -73,7 +73,7 @@ QCLuceneIndexReader QCLuceneIndexReader:
|
||||||
|
using namespace lucene::index;
|
||||||
|
|
||||||
|
QCLuceneIndexReader indexReader;
|
||||||
|
- indexReader.d->reader = IndexReader::open(path);
|
||||||
|
+ indexReader.d->reader = IndexReader::open(path.toStdString().c_str());
|
||||||
|
|
||||||
|
return indexReader;
|
||||||
|
}
|
||||||
|
@@ -81,25 +81,25 @@ QCLuceneIndexReader QCLuceneIndexReader:
|
||||||
|
void QCLuceneIndexReader::unlock(const QString &path)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- IndexReader::unlock(path);
|
||||||
|
+ IndexReader::unlock(path.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QCLuceneIndexReader::isLocked(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return IndexReader::isLocked(directory);
|
||||||
|
+ return IndexReader::isLocked(directory.toStdString().c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
quint64 QCLuceneIndexReader::lastModified(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return quint64(IndexReader::lastModified(directory));
|
||||||
|
+ return quint64(IndexReader::lastModified(directory.toStdString().c_str()));
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
|
||||||
|
{
|
||||||
|
using namespace lucene::index;
|
||||||
|
- return qint64(IndexReader::getCurrentVersion(directory));
|
||||||
|
+ return qint64(IndexReader::getCurrentVersion(directory.toStdString().c_str()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void QCLuceneIndexReader::close()
|
||||||
|
@@ -155,7 +155,7 @@ bool QCLuceneIndexReader::document(qint3
|
||||||
|
void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
|
||||||
|
{
|
||||||
|
TCHAR *fieldName = QStringToTChar(field);
|
||||||
|
- d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
|
||||||
|
+ d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
|
||||||
|
delete [] fieldName;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up qttools-opensource-src-5.1.1/src/assistant/clucene/qindexwriter.cpp.system_clucene qttools-opensource-src-5.1.1/src/assistant/clucene/qindexwriter.cpp
|
||||||
|
--- qttools-opensource-src-5.1.1/src/assistant/clucene/qindexwriter.cpp.system_clucene 2013-08-25 13:04:37.000000000 -0500
|
||||||
|
+++ qttools-opensource-src-5.1.1/src/assistant/clucene/qindexwriter.cpp 2013-08-28 15:25:53.130091320 -0500
|
||||||
|
@@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter
|
||||||
|
: d(new QCLuceneIndexWriterPrivate())
|
||||||
|
, analyzer(analyzer)
|
||||||
|
{
|
||||||
|
- d->writer = new lucene::index::IndexWriter(path,
|
||||||
|
+ d->writer = new lucene::index::IndexWriter(path.toStdString().c_str(),
|
||||||
|
analyzer.d->analyzer, create, closeDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up qttools-opensource-src-5.1.1/src/assistant/clucene/qsearchable.cpp.system_clucene qttools-opensource-src-5.1.1/src/assistant/clucene/qsearchable.cpp
|
||||||
|
--- qttools-opensource-src-5.1.1/src/assistant/clucene/qsearchable.cpp.system_clucene 2013-08-25 13:04:37.000000000 -0500
|
||||||
|
+++ qttools-opensource-src-5.1.1/src/assistant/clucene/qsearchable.cpp 2013-08-28 15:25:53.130091320 -0500
|
||||||
|
@@ -95,7 +95,7 @@ QCLuceneIndexSearcher::QCLuceneIndexSear
|
||||||
|
: QCLuceneSearcher()
|
||||||
|
{
|
||||||
|
lucene::search::IndexSearcher *searcher =
|
||||||
|
- new lucene::search::IndexSearcher(path);
|
||||||
|
+ new lucene::search::IndexSearcher(path.toStdString().c_str());
|
||||||
|
|
||||||
|
reader.d->reader = searcher->getReader();
|
||||||
|
reader.d->deleteCLuceneIndexReader = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user