1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-06-02 11:29:26.000000000 +0200
+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-08-18 02:43:46.000000000 +0200
@@ -56,7 +56,6 @@ using lucene::document::DocumentFieldEnu
using Strigi::IndexedDocument;
using Strigi::Variant;
using Strigi::FieldRegister;
-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
using namespace std;
@@ -101,9 +100,9 @@ public:
CLuceneIndexReader& reader;
Private(CLuceneIndexReader& r) :reader(r) {}
- static LuceneTerm createTerm(const wchar_t* name, const string& value);
- static LuceneTerm createKeywordTerm(const wchar_t* name, const string& value);
- static LuceneTerm createWildCardTerm(const wchar_t* name, const string& value);
+ static Term* createTerm(const wchar_t* name, const string& value);
+ static Term* createKeywordTerm(const wchar_t* name, const string& value);
+ static Term* createWildCardTerm(const wchar_t* name, const string& value);
Query* createQuery(const Strigi::Query& query);
Query* createSimpleQuery(const Strigi::Query& query);
static Query* createSingleFieldQuery(const string& field,
@@ -187,12 +186,12 @@ CLuceneIndexReader::mapId(const char* id
}
#endif
-LuceneTerm
+Term*
CLuceneIndexReader::Private::createWildCardTerm(const wchar_t* name,
const string& value) {
- return LuceneTerm(_CLNEW Term(name, utf8toucs2(value).c_str()));
+ return _CLNEW Term(name, utf8toucs2(value).c_str());
}
-LuceneTerm
+Term*
CLuceneIndexReader::Private::createTerm(const wchar_t* name,
const string& value) {
wstring v = utf8toucs2(value);
@@ -206,16 +205,15 @@ CLuceneIndexReader::Private::createTerm(
} else {
tv = v.c_str();
}
- LuceneTerm t(_CLNEW Term(name, tv));
+ Term* t = _CLNEW Term(name, tv);
_CLDELETE(ts);
return t;
}
-LuceneTerm
+Term*
CLuceneIndexReader::Private::createKeywordTerm(const wchar_t* name,
const string& value) {
wstring v = utf8toucs2(value);
- LuceneTerm t(_CLNEW Term(name, v.c_str()));
- return t;
+ return _CLNEW Term(name, v.c_str());
}
BooleanQuery*
CLuceneIndexReader::Private::createBooleanQuery(const Strigi::Query& query) {
@@ -249,25 +247,24 @@ CLuceneIndexReader::Private::createSingl
const Strigi::Query& query) {
wstring fieldname = mapId(field.c_str());
Query* q;
- LuceneTerm t;
- LuceneTerm nullTerm;
+ Term* t;
const string& val = query.term().string();
switch (query.type()) {
case Strigi::Query::LessThan:
t = createTerm(fieldname.c_str(), val.c_str());
- q = _CLNEW RangeQuery(nullTerm, t, false);
+ q = _CLNEW RangeQuery(0, t, false);
break;
case Strigi::Query::LessThanEquals:
t = createTerm(fieldname.c_str(), query.term().string());
- q = _CLNEW RangeQuery(nullTerm, t, true);
+ q = _CLNEW RangeQuery(0, t, true);
break;
case Strigi::Query::GreaterThan:
t = createTerm(fieldname.c_str(), query.term().string());
- q = _CLNEW RangeQuery(t, nullTerm, false);
+ q = _CLNEW RangeQuery(t, 0, false);
break;
case Strigi::Query::GreaterThanEquals:
t = createTerm(fieldname.c_str(), query.term().string());
- q = _CLNEW RangeQuery(t, nullTerm, true);
+ q = _CLNEW RangeQuery(t, 0, true);
break;
case Strigi::Query::Keyword:
t = createKeywordTerm(fieldname.c_str(), query.term().string());
@@ -282,6 +279,7 @@ CLuceneIndexReader::Private::createSingl
q = _CLNEW TermQuery(t);
}
}
+ _CLDECDELETE(t);
return q;
}
Query*
@@ -584,12 +582,13 @@ CLuceneIndexReader::documentId(const str
if (reader == NULL) return -1;
int64_t id = -1;
- LuceneTerm term(_CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str()));
+ Term* term = _CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str());
TermDocs* docs = reader->termDocs(term);
if (docs->next()) {
id = docs->doc();
}
_CLDELETE(docs);
+ _CLDECDELETE(term);
if (id != -1 && reader->isDeleted((int32_t)id)) {
id = -1;
@@ -770,12 +769,13 @@ CLuceneIndexReader::keywords(const strin
const wchar_t* prefixtext = prefix.c_str();
string::size_type prefixLen = prefix.length();
vector<string>::const_iterator i;
- LuceneTerm lastTerm;
+ Term* lastTerm;
for (i = fn.begin(); i != fn.end() && s.size() << max; ++i) {
wstring fieldname(utf8toucs2(*i));
- LuceneTerm term(_CLNEW Term(fieldname.c_str(), prefix.c_str()));
+ Term* term = _CLNEW Term(fieldname.c_str(), prefix.c_str());
TermEnum* enumerator = reader->terms(term);
do {
+ _CLDECDELETE(lastTerm);
lastTerm = enumerator->term();
if (lastTerm) {
if (prefixLen > lastTerm->textLength()
@@ -786,7 +786,9 @@ CLuceneIndexReader::keywords(const strin
s.insert(lastTerm->text());
}
} while (enumerator->next() && s.size() < max);
+ _CLDECDELETE(term);
}
+ _CLDECDELETE(lastTerm);
k.reserve(s.size());
set<wstring>::const_iterator j;
diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-06-02 11:29:26.000000000 +0200
+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-08-18 02:43:46.000000000 +0200
@@ -45,7 +45,6 @@ using lucene::util::BitSet;
using lucene::util::Reader;
using namespace std;
using namespace Strigi;
-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
struct CLuceneDocData {
lucene::document::Document doc;
@@ -219,18 +218,19 @@ void
CLuceneIndexWriter::deleteEntry(const string& entry, lucene::index::IndexWriter* writer, lucene::index::IndexReader* reader) {
wstring path(utf8toucs2(entry));
{
- LuceneTerm t(_CLNEW Term(systemlocation(), path.c_str()));
+ Term* t = _CLNEW Term(systemlocation(), path.c_str());
writer->deleteDocuments(t);
+ _CLDECDELETE(t);
}
{
- LuceneTerm t(_CLNEW Term(parentlocation(), path.c_str()));
+ Term* t = _CLNEW Term(parentlocation(), path.c_str());
writer->deleteDocuments(t);
-
+ _CLDECDELETE(t);
}
{
// delete all deeper nested files
wstring v = utf8toucs2(entry+"/");
- LuceneTerm t(_CLNEW Term(parentlocation(), v.c_str()));
+ Term* t(_CLNEW Term(parentlocation(), v.c_str()));
PrefixFilter* filter = _CLNEW PrefixFilter(t);
BitSet* b = filter->bits(reader);
_CLDELETE(filter);
@@ -241,6 +241,7 @@ CLuceneIndexWriter::deleteEntry(const st
}
}
_CLDELETE(b);
+ _CLDECDELETE(t);
}
}
void
diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-06-02 11:29:26.000000000 +0200
+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-08-18 02:43:46.000000000 +0200
@@ -40,7 +40,6 @@ using lucene::search::HitCollector;
using lucene::util::BitSet;
using lucene::document::DocumentFieldEnumeration;
using lucene::index::IndexReader;
-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
std::string
t2a(const TCHAR* t) {
@@ -68,10 +67,11 @@ indexdump(const char* dir) {
}
}
TermEnum* terms = indexreader->terms();
- LuceneTerm t;
+ Term* t = 0;
while (terms->next()) {
t = terms->term();
printf("%s: %s\n", t2a(t->field()).c_str(), t2a(t->text()).c_str());
+ _CLDECDELETE(t);
}
}
int
|
