Menu
▾
▴
[Clucene-cvs] SF.net SVN: clucene:[3014] branches/lucene2_3_2/src/core/CLucene
|
From: <ust...@us...> - 2009-07-08 09:55:55
|
Revision: 3014
http://clucene.svn.sourceforge.net/clucene/?rev=3014&view=rev
Author: ustramooner
Date: 2009-07-08 09:55:52 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
cleanups and tweaks
Modified Paths:
--------------
branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Hits.cpp
branches/lucene2_3_2/src/core/CLucene/search/Hits.h
Modified: branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp 2009-07-08 09:54:46 UTC (rev 3013)
+++ branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp 2009-07-08 09:55:52 UTC (rev 3014)
@@ -284,7 +284,7 @@
if ( term != NULL ){
//Seek enumerator to term; delete the new TermInfo that's returned.
TermInfo* ti = get(term);
- _CLDELETE(ti);
+ _CLLDELETE(ti);
enumerator = getEnum();
}else
enumerator = origEnum;
Modified: branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp 2009-07-08 09:54:46 UTC (rev 3013)
+++ branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp 2009-07-08 09:55:52 UTC (rev 3014)
@@ -61,7 +61,7 @@
dWidth = LUCENE_TYPICAL_LONGEST_WORD_IN_INDEX; // default length of the d array
dHeight = textLen + 1;
- Term* trm = _CLNEW Term(searchTerm->field(), prefix, true); // _CLNEW Term(term, prefix); -- not intern'd?
+ Term* trm = _CLNEW Term(searchTerm->field(), prefix); // _CLNEW Term(term, prefix); -- not intern'd?
setEnum(reader->terms(trm));
_CLDECDELETE(trm);
Modified: branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h 2009-07-08 09:54:46 UTC (rev 3013)
+++ branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h 2009-07-08 09:55:52 UTC (rev 3014)
@@ -20,7 +20,7 @@
class CLUCENE_EXPORT FuzzyQuery: public MultiTermQuery {
private:
class ScoreTerm;
- class ScoreTermQueue;
+ class ScoreTermQueue;
float_t minimumSimilarity;
size_t prefixLength;
Modified: branches/lucene2_3_2/src/core/CLucene/search/Hits.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/search/Hits.cpp 2009-07-08 09:54:46 UTC (rev 3013)
+++ branches/lucene2_3_2/src/core/CLucene/search/Hits.cpp 2009-07-08 09:55:52 UTC (rev 3014)
@@ -81,7 +81,7 @@
return cnt;
}
- int32_t Hits::length() const {
+ size_t Hits::length() const {
return _length;
}
Modified: branches/lucene2_3_2/src/core/CLucene/search/Hits.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/search/Hits.h 2009-07-08 09:54:46 UTC (rev 3013)
+++ branches/lucene2_3_2/src/core/CLucene/search/Hits.h 2009-07-08 09:55:52 UTC (rev 3014)
@@ -18,21 +18,21 @@
class HitDoc;
class Sort;
- /** A ranked list of documents, used to hold search results.
- * <p>
- * <b>Caution:</b> Iterate only over the hits needed. Iterating over all
- * hits is generally not desirable and may be the source of
- * performance issues. If you need to iterate over many or all hits, consider
- * using the search method that takes a {@link HitCollector}.
- * </p>
- * <p><b>Note:</b> Deleting matching documents concurrently with traversing
- * the hits, might, when deleting hits that were not yet retrieved, decrease
- * {@link #length()}. In such case,
- * {@link java.util.ConcurrentModificationException ConcurrentModificationException}
- * is thrown when accessing hit <code>n</code> ≥ current_{@link #length()}
- * (but <code>n</code> < {@link #length()}_at_start).
+ /** A ranked list of documents, used to hold search results.
+ * <p>
+ * <b>Caution:</b> Iterate only over the hits needed. Iterating over all
+ * hits is generally not desirable and may be the source of
+ * performance issues. If you need to iterate over many or all hits, consider
+ * using the search method that takes a {@link HitCollector}.
+ * </p>
+ * <p><b>Note:</b> Deleting matching documents concurrently with traversing
+ * the hits, might, when deleting hits that were not yet retrieved, decrease
+ * {@link #length()}. In such case,
+ * {@link java.util.ConcurrentModificationException ConcurrentModificationException}
+ * is thrown when accessing hit <code>n</code> ≥ current_{@link #length()}
+ * (but <code>n</code> < {@link #length()}_at_start).
*/
- class CLUCENE_EXPORT Hits:LUCENE_BASE {
+ class CLUCENE_EXPORT Hits {
private:
Query* query;
Searcher* searcher;
@@ -68,15 +68,15 @@
public:
Hits(Searcher* s, Query* q, Filter* f, const Sort* sort=NULL);
- ~Hits();
+ virtual ~Hits();
/** Returns the total number of hits available in this set. */
- int32_t length() const;
+ size_t length() const;
- /** Returns the stored fields of the n<sup>th</sup> document in this set.
- * <p>Documents are cached, so that repeated requests for the same element may
- * return the same Document object.
- * @throws CorruptIndexException if the index is corrupt
+ /** Returns the stored fields of the n<sup>th</sup> document in this set.
+ * <p>Documents are cached, so that repeated requests for the same element may
+ * return the same Document object.
+ * @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*
* @memory Memory belongs to the hits object. Don't delete the return value.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|