You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2010/11/04 06:36:56 UTC
[lucy-commits] svn commit: r1030838 [4/12] - in /incubator/lucy/trunk: ./
clownfish/lib/Clownfish/Binding/ clownfish/lib/Clownfish/Binding/Core/
clownfish/lib/Clownfish/Binding/Perl/ core/KinoSearch/ core/Lucy/
core/Lucy/Analysis/ core/Lucy/Docs/ core/Lucy/Document/ ...
Modified: incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.cfh Thu Nov 4 05:36:36 2010
@@ -20,14 +20,14 @@ parcel Lucy;
*
* Use the IndexSearcher class to perform search queries against an index.
* (For searching multiple indexes at once, see
- * L<PolySearcher|KinoSearch::Search::PolySearcher>).
+ * L<PolySearcher|Lucy::Search::PolySearcher>).
*
* IndexSearchers operate against a single point-in-time view or
- * L<Snapshot|KinoSearch::Index::Snapshot> of the index. If an index is
+ * L<Snapshot|Lucy::Index::Snapshot> of the index. If an index is
* modified, a new IndexSearcher must be opened to access the changes.
*/
-class KinoSearch::Search::IndexSearcher cnick IxSearcher
- inherits KinoSearch::Search::Searcher {
+class Lucy::Search::IndexSearcher cnick IxSearcher
+ inherits Lucy::Search::Searcher {
IndexReader *reader;
DocReader *doc_reader;
Modified: incubator/lucy/trunk/core/Lucy/Search/LeafQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/LeafQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/LeafQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/LeafQuery.c Thu Nov 4 05:36:36 2010
@@ -15,13 +15,13 @@
*/
#define C_LUCY_LEAFQUERY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/Compiler.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/Compiler.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
LeafQuery*
LeafQuery_new(const CharBuf *field, const CharBuf *text)
Modified: incubator/lucy/trunk/core/Lucy/Search/LeafQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/LeafQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/LeafQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/LeafQuery.cfh Thu Nov 4 05:36:36 2010
@@ -19,13 +19,13 @@ parcel Lucy;
/** Leaf node in a tree created by QueryParser.
*
* LeafQuery objects serve as leaf nodes in the tree structure generated by
- * L<QueryParser|KinoSearch::Search::QueryParser>'s Tree() method.
+ * L<QueryParser|Lucy::Search::QueryParser>'s Tree() method.
* Ultimately, they must be transformed, typically into either
- * L<TermQuery|KinoSearch::Search::TermQuery> or
- * L<PhraseQuery|KinoSearch::Search::PhraseQuery> objects, as attempting to
+ * L<TermQuery|Lucy::Search::TermQuery> or
+ * L<PhraseQuery|Lucy::Search::PhraseQuery> objects, as attempting to
* search a LeafQuery causes an error.
*/
-class KinoSearch::Search::LeafQuery inherits KinoSearch::Search::Query
+class Lucy::Search::LeafQuery inherits Lucy::Search::Query
: dumpable {
CharBuf *field;
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.c Thu Nov 4 05:36:36 2010
@@ -15,19 +15,19 @@
*/
#define C_LUCY_MATCHALLQUERY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/MatchAllQuery.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Search/MatchAllScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/MatchAllQuery.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Search/MatchAllScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
MatchAllQuery*
MatchAllQuery_new()
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchAllQuery.cfh Thu Nov 4 05:36:36 2010
@@ -23,8 +23,8 @@ parcel Lucy;
* which matches against another part of the query will be ranked higher than
* a document which matches only via the MatchAllQuery.
*/
-abstract class KinoSearch::Search::MatchAllQuery
- inherits KinoSearch::Search::Query : dumpable {
+abstract class Lucy::Search::MatchAllQuery
+ inherits Lucy::Search::Query : dumpable {
inert incremented MatchAllQuery*
new();
@@ -44,8 +44,8 @@ abstract class KinoSearch::Search::Match
Make_Compiler(MatchAllQuery *self, Searcher *searcher, float boost);
}
-class KinoSearch::Search::MatchAllCompiler
- inherits KinoSearch::Search::Compiler {
+class Lucy::Search::MatchAllCompiler
+ inherits Lucy::Search::Compiler {
inert incremented MatchAllCompiler*
new(MatchAllQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_MATCHALLSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/MatchAllScorer.h"
+#include "Lucy/Search/MatchAllScorer.h"
MatchAllScorer*
MatchAllScorer_new(float score, int32_t doc_max)
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchAllScorer.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Search::MatchAllScorer inherits KinoSearch::Search::Matcher {
+class Lucy::Search::MatchAllScorer inherits Lucy::Search::Matcher {
int32_t doc_id;
int32_t doc_max;
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchDoc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchDoc.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchDoc.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchDoc.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_MATCHDOC
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
MatchDoc*
MatchDoc_new(int32_t doc_id, float score, VArray *values)
Modified: incubator/lucy/trunk/core/Lucy/Search/MatchDoc.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/MatchDoc.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/MatchDoc.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/MatchDoc.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Representation of a document being evaluated as a hit.
*/
-class KinoSearch::Search::MatchDoc inherits KinoSearch::Object::Obj {
+class Lucy::Search::MatchDoc inherits Lucy::Object::Obj {
int32_t doc_id;
float score;
Modified: incubator/lucy/trunk/core/Lucy/Search/Matcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Matcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Matcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Matcher.c Thu Nov 4 05:36:36 2010
@@ -18,10 +18,10 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Search/Matcher.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Search/Collector.h"
+#include "Lucy/Search/Matcher.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Search/Collector.h"
Matcher*
Matcher_init(Matcher *self)
Modified: incubator/lucy/trunk/core/Lucy/Search/Matcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Matcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Matcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Matcher.cfh Thu Nov 4 05:36:36 2010
@@ -23,7 +23,7 @@ parcel Lucy;
* match. Other implementations may be match-only.
*/
-abstract class KinoSearch::Search::Matcher inherits KinoSearch::Object::Obj {
+abstract class Lucy::Search::Matcher inherits Lucy::Object::Obj {
/** Abstract constructor.
*/
Modified: incubator/lucy/trunk/core/Lucy/Search/NOTQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NOTQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NOTQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NOTQuery.c Thu Nov 4 05:36:36 2010
@@ -16,16 +16,16 @@
#define C_LUCY_NOTQUERY
#define C_LUCY_NOTCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Search/MatchAllScorer.h"
-#include "KinoSearch/Search/NOTScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Search/MatchAllScorer.h"
+#include "Lucy/Search/NOTScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
NOTQuery*
NOTQuery_new(Query *negated_query)
Modified: incubator/lucy/trunk/core/Lucy/Search/NOTQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NOTQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NOTQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NOTQuery.cfh Thu Nov 4 05:36:36 2010
@@ -18,16 +18,16 @@ parcel Lucy;
/** Invert the result set of another Query.
*
- * A NOTQuery wraps another L<Query|KinoSearch::Search::Query> and matches
+ * A NOTQuery wraps another L<Query|Lucy::Search::Query> and matches
* against its inverse document set. All matching docs recieve a score of
* 0.0.
*
* NOTQuery is often used in conjunction with
- * L<ANDQuery|KinoSearch::Search::ANDQuery> to provide "a AND NOT b"
+ * L<ANDQuery|Lucy::Search::ANDQuery> to provide "a AND NOT b"
* semantics.
*/
-class KinoSearch::Search::NOTQuery inherits KinoSearch::Search::PolyQuery
+class Lucy::Search::NOTQuery inherits Lucy::Search::PolyQuery
: dumpable {
/**
@@ -60,8 +60,8 @@ class KinoSearch::Search::NOTQuery inher
Equals(NOTQuery *self, Obj *other);
}
-class KinoSearch::Search::NOTCompiler
- inherits KinoSearch::Search::PolyCompiler {
+class Lucy::Search::NOTCompiler
+ inherits Lucy::Search::PolyCompiler {
inert incremented NOTCompiler*
new(NOTQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/NOTScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NOTScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NOTScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NOTScorer.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_NOTSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/NOTScorer.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
+#include "Lucy/Search/NOTScorer.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
NOTScorer*
NOTScorer_new(Matcher *negated_matcher, int32_t doc_max)
Modified: incubator/lucy/trunk/core/Lucy/Search/NOTScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NOTScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NOTScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NOTScorer.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Return the inverse of a Matcher's set. Scores are always 0.
*/
-class KinoSearch::Search::NOTScorer inherits KinoSearch::Search::PolyMatcher {
+class Lucy::Search::NOTScorer inherits Lucy::Search::PolyMatcher {
Matcher *negated_matcher;
int32_t doc_id;
Modified: incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.c Thu Nov 4 05:36:36 2010
@@ -15,17 +15,17 @@
*/
#define C_LUCY_NOMATCHQUERY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/NoMatchQuery.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/NoMatchScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/NoMatchQuery.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/NoMatchScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
NoMatchQuery*
NoMatchQuery_new()
Modified: incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NoMatchQuery.cfh Thu Nov 4 05:36:36 2010
@@ -20,10 +20,10 @@ parcel Lucy;
*
* NoMatchQuery is a utility class representing a query which matches nothing.
* Typical usage might include e.g. returning a NoMatchQuery when a
- * L<QueryParser|KinoSearch::Search::QueryParser> is asked to parse an empty
+ * L<QueryParser|Lucy::Search::QueryParser> is asked to parse an empty
* string.
*/
-class KinoSearch::Search::NoMatchQuery inherits KinoSearch::Search::Query
+class Lucy::Search::NoMatchQuery inherits Lucy::Search::Query
: dumpable {
inert incremented NoMatchQuery*
@@ -44,8 +44,8 @@ class KinoSearch::Search::NoMatchQuery i
Make_Compiler(NoMatchQuery *self, Searcher *searcher, float boost);
}
-class KinoSearch::Search::NoMatchCompiler
- inherits KinoSearch::Search::Compiler {
+class Lucy::Search::NoMatchCompiler
+ inherits Lucy::Search::Compiler {
inert incremented NoMatchCompiler*
new(NoMatchQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.c Thu Nov 4 05:36:36 2010
@@ -15,12 +15,12 @@
*/
#define C_LUCY_NOMATCHSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/NoMatchScorer.h"
-#include "KinoSearch/Index/IndexReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
+#include "Lucy/Search/NoMatchScorer.h"
+#include "Lucy/Index/IndexReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
NoMatchScorer*
NoMatchScorer_new()
Modified: incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/NoMatchScorer.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Search::NoMatchScorer inherits KinoSearch::Search::Matcher {
+class Lucy::Search::NoMatchScorer inherits Lucy::Search::Matcher {
inert incremented NoMatchScorer*
new();
Modified: incubator/lucy/trunk/core/Lucy/Search/ORMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ORMatcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ORMatcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ORMatcher.c Thu Nov 4 05:36:36 2010
@@ -16,10 +16,10 @@
#define C_LUCY_ORMATCHER
#define C_LUCY_ORSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/ORMatcher.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Search/ORMatcher.h"
+#include "Lucy/Index/Similarity.h"
// Add an element to the queue. Unsafe -- bounds checking of queue size is
// left to the caller.
Modified: incubator/lucy/trunk/core/Lucy/Search/ORMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ORMatcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ORMatcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ORMatcher.cfh Thu Nov 4 05:36:36 2010
@@ -17,7 +17,7 @@
parcel Lucy;
__C__
-#include "KinoSearch/Search/Matcher.h"
+#include "Lucy/Search/Matcher.h"
/* A wrapper for a Matcher which caches the result of Matcher_Get_Doc_ID().
*/
@@ -36,7 +36,7 @@ __END_C__
* queue.
*/
-class KinoSearch::Search::ORMatcher inherits KinoSearch::Search::PolyMatcher {
+class Lucy::Search::ORMatcher inherits Lucy::Search::PolyMatcher {
lucy_HeapedMatcherDoc **heap;
lucy_HeapedMatcherDoc **pool; /* Pool of HMDs to minimize mallocs */
@@ -73,7 +73,7 @@ class KinoSearch::Search::ORMatcher inhe
* ORScorer collates the output of multiple subscorers, summing their scores
* whenever they match the same document.
*/
-class KinoSearch::Search::ORScorer inherits KinoSearch::Search::ORMatcher {
+class Lucy::Search::ORScorer inherits Lucy::Search::ORMatcher {
float *scores;
int32_t doc_id;
Modified: incubator/lucy/trunk/core/Lucy/Search/ORQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ORQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ORQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ORQuery.c Thu Nov 4 05:36:36 2010
@@ -16,15 +16,15 @@
#define C_LUCY_ORQUERY
#define C_LUCY_ORCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/ORQuery.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Search/ORMatcher.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/ORQuery.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Search/ORMatcher.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
ORQuery*
ORQuery_new(VArray *children)
Modified: incubator/lucy/trunk/core/Lucy/Search/ORQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ORQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ORQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ORQuery.cfh Thu Nov 4 05:36:36 2010
@@ -18,13 +18,13 @@ parcel Lucy;
/** Union multiple result sets.
*
- * ORQuery is a composite L<Query|KinoSearch::Search::Query> which matches
+ * ORQuery is a composite L<Query|Lucy::Search::Query> which matches
* when any of its children match, so its result set is the union of their
* result sets. Matching documents recieve a summed score from all matching
* child Queries.
*/
-class KinoSearch::Search::ORQuery inherits KinoSearch::Search::PolyQuery
+class Lucy::Search::ORQuery inherits Lucy::Search::PolyQuery
: dumpable {
inert incremented ORQuery*
@@ -46,8 +46,8 @@ class KinoSearch::Search::ORQuery inheri
Equals(ORQuery *self, Obj *other);
}
-class KinoSearch::Search::ORCompiler
- inherits KinoSearch::Search::PolyCompiler {
+class Lucy::Search::ORCompiler
+ inherits Lucy::Search::PolyCompiler {
inert incremented ORCompiler*
new(ORQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.c Thu Nov 4 05:36:36 2010
@@ -18,26 +18,26 @@
#define C_LUCY_PHRASECOMPILER
#include <stdarg.h>
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/Posting.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/PostingListReader.h"
-#include "KinoSearch/Index/SegPostingList.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Index/TermVector.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/PhraseScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/Posting.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/PostingListReader.h"
+#include "Lucy/Index/SegPostingList.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Index/TermVector.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/PhraseScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
// Shared initialization routine which assumes that it's ok to assume control
// over [field] and [terms], eating their refcounts.
Modified: incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PhraseQuery.cfh Thu Nov 4 05:36:36 2010
@@ -18,11 +18,11 @@ parcel Lucy;
/** Query matching an ordered list of terms.
*
- * PhraseQuery is a subclass of L<KinoSearch::Search::Query> for matching
+ * PhraseQuery is a subclass of L<Lucy::Search::Query> for matching
* against an ordered sequence of terms.
*/
-class KinoSearch::Search::PhraseQuery inherits KinoSearch::Search::Query
+class Lucy::Search::PhraseQuery inherits Lucy::Search::Query
: dumpable {
CharBuf *field;
@@ -67,8 +67,8 @@ class KinoSearch::Search::PhraseQuery in
Destroy(PhraseQuery *self);
}
-class KinoSearch::Search::PhraseCompiler
- inherits KinoSearch::Search::Compiler {
+class Lucy::Search::PhraseCompiler
+ inherits Lucy::Search::Compiler {
float idf;
float raw_weight;
Modified: incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.c Thu Nov 4 05:36:36 2010
@@ -17,13 +17,13 @@
#define C_LUCY_PHRASESCORER
#define C_LUCY_POSTING
#define C_LUCY_SCOREPOSTING
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/PhraseScorer.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Search/Compiler.h"
+#include "Lucy/Search/PhraseScorer.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Search/Compiler.h"
PhraseScorer*
PhraseScorer_new(Similarity *sim, VArray *plists, Compiler *compiler)
Modified: incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PhraseScorer.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Matcher for a PhraseQuery.
*/
-class KinoSearch::Search::PhraseScorer inherits KinoSearch::Search::Matcher {
+class Lucy::Search::PhraseScorer inherits Lucy::Search::Matcher {
int32_t doc_id;
uint32_t num_elements;
Modified: incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_POLYMATCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/PolyMatcher.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Search/PolyMatcher.h"
+#include "Lucy/Index/Similarity.h"
PolyMatcher*
PolyMatcher_new(VArray *children, Similarity *sim)
Modified: incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolyMatcher.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Base class for composite scorers.
*/
-class KinoSearch::Search::PolyMatcher inherits KinoSearch::Search::Matcher {
+class Lucy::Search::PolyMatcher inherits Lucy::Search::Matcher {
VArray *children;
Similarity *sim;
Modified: incubator/lucy/trunk/core/Lucy/Search/PolyQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolyQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolyQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolyQuery.c Thu Nov 4 05:36:36 2010
@@ -16,17 +16,17 @@
#define C_LUCY_POLYQUERY
#define C_LUCY_POLYCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/PolyQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/PolyQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
PolyQuery*
PolyQuery_init(PolyQuery *self, VArray *children)
Modified: incubator/lucy/trunk/core/Lucy/Search/PolyQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolyQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolyQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolyQuery.cfh Thu Nov 4 05:36:36 2010
@@ -19,15 +19,15 @@ parcel Lucy;
/** Base class for composite Query objects.
*
* PolyQuery serves as a shared base class for
- * L<ANDQuery|KinoSearch::Search::ANDQuery>,
- * L<ORQuery|KinoSearch::Search::ORQuery>,
- * L<NOTQuery|KinoSearch::Search::NOTQuery>, and
- * L<RequiredOptionalQuery|KinoSearch::Search::RequiredOptionalQuery>. All of
+ * L<ANDQuery|Lucy::Search::ANDQuery>,
+ * L<ORQuery|Lucy::Search::ORQuery>,
+ * L<NOTQuery|Lucy::Search::NOTQuery>, and
+ * L<RequiredOptionalQuery|Lucy::Search::RequiredOptionalQuery>. All of
* these classes may serve as nodes in composite Query with a tree structure
* which may be walked.
*/
-abstract class KinoSearch::Search::PolyQuery
- inherits KinoSearch::Search::Query : dumpable {
+abstract class Lucy::Search::PolyQuery
+ inherits Lucy::Search::Query : dumpable {
VArray *children;
@@ -61,7 +61,7 @@ abstract class KinoSearch::Search::PolyQ
Destroy(PolyQuery *self);
}
-class KinoSearch::Search::PolyCompiler inherits KinoSearch::Search::Compiler {
+class Lucy::Search::PolyCompiler inherits Lucy::Search::Compiler {
VArray *children;
Modified: incubator/lucy/trunk/core/Lucy/Search/PolySearcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolySearcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolySearcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolySearcher.c Thu Nov 4 05:36:36 2010
@@ -15,23 +15,23 @@
*/
#define C_LUCY_POLYSEARCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/PolySearcher.h"
+#include "Lucy/Search/PolySearcher.h"
-#include "KinoSearch/Document/HitDoc.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/PolyReader.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Collector.h"
-#include "KinoSearch/Search/HitQueue.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Search/Matcher.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/SortSpec.h"
-#include "KinoSearch/Search/TopDocs.h"
-#include "KinoSearch/Search/Compiler.h"
+#include "Lucy/Document/HitDoc.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/PolyReader.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Collector.h"
+#include "Lucy/Search/HitQueue.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Search/Matcher.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/SortSpec.h"
+#include "Lucy/Search/TopDocs.h"
+#include "Lucy/Search/Compiler.h"
PolySearcher*
PolySearcher_init(PolySearcher *self, Schema *schema, VArray *searchers)
Modified: incubator/lucy/trunk/core/Lucy/Search/PolySearcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/PolySearcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/PolySearcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/PolySearcher.cfh Thu Nov 4 05:36:36 2010
@@ -19,14 +19,14 @@ parcel Lucy;
/** Aggregate results from multiple Searchers.
*
* The primary use for PolySearcher is to aggregate results from several
- * remote L<Searchers|KinoSearch::Search::Searcher> via
+ * remote L<Searchers|Lucy::Search::Searcher> via
* L<LucyX::Remote::SearchClient>, diffusing the cost of searching a large
* corpus over multiple machines. It is also possible to aggregate results
* from multiple Searchers on a single machine.
*/
-class KinoSearch::Search::PolySearcher
- inherits KinoSearch::Search::Searcher {
+class Lucy::Search::PolySearcher
+ inherits Lucy::Search::Searcher {
VArray *searchers;
I32Array *starts;
Modified: incubator/lucy/trunk/core/Lucy/Search/Query.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Query.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Query.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Query.c Thu Nov 4 05:36:36 2010
@@ -15,13 +15,13 @@
*/
#define C_LUCY_QUERY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/Compiler.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/Compiler.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
Query*
Query_init(Query *self, float boost)
Modified: incubator/lucy/trunk/core/Lucy/Search/Query.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Query.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Query.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Query.cfh Thu Nov 4 05:36:36 2010
@@ -22,19 +22,19 @@ parcel Lucy;
* necessary to define a search query.
*
* The most common way to generate Query objects is to feed a search string
- * such as 'foo AND bar' to a L<QueryParser's|KinoSearch::Search::QueryParser>
+ * such as 'foo AND bar' to a L<QueryParser's|Lucy::Search::QueryParser>
* Parse() method, which outputs an abstract syntax tree built up from various
- * Query subclasses such as L<ANDQuery|KinoSearch::Search::ANDQuery> and
- * L<TermQuery|KinoSearch::Search::TermQuery>. However, it is also possible
+ * Query subclasses such as L<ANDQuery|Lucy::Search::ANDQuery> and
+ * L<TermQuery|Lucy::Search::TermQuery>. However, it is also possible
* to use custom Query objects to build a search specification which cannot be
* easily represented using a search string.
*
* Subclasses of Query must implement Make_Compiler(), which is the first step
- * in compiling a Query down to a L<Matcher|KinoSearch::Search::Matcher> which
+ * in compiling a Query down to a L<Matcher|Lucy::Search::Matcher> which
* can actually match and score documents.
*/
-class KinoSearch::Search::Query inherits KinoSearch::Object::Obj : dumpable {
+class Lucy::Search::Query inherits Lucy::Object::Obj : dumpable {
float boost;
Modified: incubator/lucy/trunk/core/Lucy/Search/QueryParser.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/QueryParser.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/QueryParser.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/QueryParser.c Thu Nov 4 05:36:36 2010
@@ -20,22 +20,22 @@
#define C_LUCY_VIEWCHARBUF
#include <stdlib.h>
#include <ctype.h>
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/QueryParser.h"
-#include "KinoSearch/Analysis/Analyzer.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Search/MatchAllQuery.h"
-#include "KinoSearch/Search/NoMatchQuery.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Search/ORQuery.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Search/RequiredOptionalQuery.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Search/Query.h"
+#include "Lucy/Search/QueryParser.h"
+#include "Lucy/Analysis/Analyzer.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Search/MatchAllQuery.h"
+#include "Lucy/Search/NoMatchQuery.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Search/ORQuery.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Search/RequiredOptionalQuery.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Search/Query.h"
#define SHOULD 0x00000001
#define MUST 0x00000002
Modified: incubator/lucy/trunk/core/Lucy/Search/QueryParser.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/QueryParser.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/QueryParser.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/QueryParser.cfh Thu Nov 4 05:36:36 2010
@@ -19,9 +19,9 @@ parcel Lucy;
/** Transform a string into a Query object.
*
* QueryParser accepts search strings as input and produces
- * L<KinoSearch::Search::Query> objects, suitable for feeding into
- * L<IndexSearcher|KinoSearch::Search::IndexSearcher> and other
- * L<Searcher|KinoSearch::Search::Searcher> subclasses.
+ * L<Lucy::Search::Query> objects, suitable for feeding into
+ * L<IndexSearcher|Lucy::Search::IndexSearcher> and other
+ * L<Searcher|Lucy::Search::Searcher> subclasses.
*
* The following syntactical constructs are recognized by QueryParser:
*
@@ -40,8 +40,8 @@ parcel Lucy;
*
*
*/
-class KinoSearch::Search::QueryParser cnick QParser
- inherits KinoSearch::Object::Obj {
+class Lucy::Search::QueryParser cnick QParser
+ inherits Lucy::Object::Obj {
Schema *schema;
Analyzer *analyzer;
@@ -58,8 +58,8 @@ class KinoSearch::Search::QueryParser cn
/** Constructor.
*
- * @param schema A L<Schema|KinoSearch::Plan::Schema>.
- * @param analyzer An L<Analyzer|KinoSearch::Analysis::Analyzer>.
+ * @param schema A L<Schema|Lucy::Plan::Schema>.
+ * @param analyzer An L<Analyzer|Lucy::Analysis::Analyzer>.
* Ordinarily, the analyzers specified by each field's definition will be
* used, but if C<analyzer> is supplied, it will override and be used for
* all fields. This can lead to mismatches between what is in the index
@@ -229,7 +229,7 @@ class KinoSearch::Search::QueryParser cn
/** Private utility class.
*/
-class KinoSearch::QueryParser::ParserClause inherits KinoSearch::Object::Obj {
+class Lucy::QueryParser::ParserClause inherits Lucy::Object::Obj {
uint32_t occur;
Query *query;
@@ -246,7 +246,7 @@ class KinoSearch::QueryParser::ParserCla
/** Private utility class.
*/
-class KinoSearch::QueryParser::ParserToken inherits KinoSearch::Object::Obj {
+class Lucy::QueryParser::ParserToken inherits Lucy::Object::Obj {
uint32_t type;
CharBuf *text;
Modified: incubator/lucy/trunk/core/Lucy/Search/RangeQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RangeQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RangeQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RangeQuery.c Thu Nov 4 05:36:36 2010
@@ -16,21 +16,21 @@
#define C_LUCY_RANGEQUERY
#define C_LUCY_RANGECOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/RangeQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/RangeScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/RangeQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/RangeScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
// Determine the lowest ordinal that should match.
static int32_t
Modified: incubator/lucy/trunk/core/Lucy/Search/RangeQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RangeQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RangeQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RangeQuery.cfh Thu Nov 4 05:36:36 2010
@@ -22,7 +22,7 @@ parcel Lucy;
* within a given range.
*/
-class KinoSearch::Search::RangeQuery inherits KinoSearch::Search::Query
+class Lucy::Search::RangeQuery inherits Lucy::Search::Query
: dumpable {
CharBuf *field;
@@ -73,7 +73,7 @@ class KinoSearch::Search::RangeQuery inh
Destroy(RangeQuery *self);
}
-class KinoSearch::Search::RangeCompiler inherits KinoSearch::Search::Compiler {
+class Lucy::Search::RangeCompiler inherits Lucy::Search::Compiler {
inert incremented RangeCompiler*
new(RangeQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/RangeScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RangeScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RangeScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RangeScorer.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_RANGESCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/RangeScorer.h"
-#include "KinoSearch/Index/SortCache.h"
+#include "Lucy/Search/RangeScorer.h"
+#include "Lucy/Index/SortCache.h"
RangeScorer*
RangeScorer_new(int32_t lower_bound, int32_t upper_bound, SortCache *sort_cache,
Modified: incubator/lucy/trunk/core/Lucy/Search/RangeScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RangeScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RangeScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RangeScorer.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Search::RangeScorer inherits KinoSearch::Search::Matcher {
+class Lucy::Search::RangeScorer inherits Lucy::Search::Matcher {
int32_t doc_id;
int32_t doc_max;
Modified: incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.c Thu Nov 4 05:36:36 2010
@@ -16,14 +16,14 @@
#define C_LUCY_REQUIREDOPTIONALQUERY
#define C_LUCY_REQUIREDOPTIONALCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/RequiredOptionalQuery.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/RequiredOptionalScorer.h"
-#include "KinoSearch/Search/Searcher.h"
+#include "Lucy/Search/RequiredOptionalQuery.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/RequiredOptionalScorer.h"
+#include "Lucy/Search/Searcher.h"
RequiredOptionalQuery*
ReqOptQuery_new(Query *required_query, Query *optional_query)
Modified: incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalQuery.cfh Thu Nov 4 05:36:36 2010
@@ -23,8 +23,8 @@ parcel Lucy;
* its score is passed along; when both match, the scores are summed.
*/
-class KinoSearch::Search::RequiredOptionalQuery cnick ReqOptQuery
- inherits KinoSearch::Search::PolyQuery {
+class Lucy::Search::RequiredOptionalQuery cnick ReqOptQuery
+ inherits Lucy::Search::PolyQuery {
inert incremented RequiredOptionalQuery*
new(Query *required_query, Query *optional_query);
@@ -64,8 +64,8 @@ class KinoSearch::Search::RequiredOption
Equals(RequiredOptionalQuery *self, Obj *other);
}
-class KinoSearch::Search::RequiredOptionalCompiler cnick ReqOptCompiler
- inherits KinoSearch::Search::PolyCompiler {
+class Lucy::Search::RequiredOptionalCompiler cnick ReqOptCompiler
+ inherits Lucy::Search::PolyCompiler {
inert incremented RequiredOptionalCompiler*
new(RequiredOptionalQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_REQUIREDOPTIONALSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/RequiredOptionalScorer.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Search/RequiredOptionalScorer.h"
+#include "Lucy/Index/Similarity.h"
RequiredOptionalScorer*
ReqOptScorer_new(Similarity *similarity, Matcher *required_matcher,
Modified: incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/RequiredOptionalScorer.cfh Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@ parcel Lucy;
/** Intersect required and optional scorers.
*/
-class KinoSearch::Search::RequiredOptionalScorer cnick ReqOptScorer
- inherits KinoSearch::Search::PolyMatcher {
+class Lucy::Search::RequiredOptionalScorer cnick ReqOptScorer
+ inherits Lucy::Search::PolyMatcher {
Matcher *req_matcher;
Matcher *opt_matcher;
Modified: incubator/lucy/trunk/core/Lucy/Search/Searcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Searcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Searcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Searcher.c Thu Nov 4 05:36:36 2010
@@ -15,20 +15,20 @@
*/
#define C_LUCY_SEARCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Searcher.h"
+#include "Lucy/Search/Searcher.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Collector.h"
-#include "KinoSearch/Search/Hits.h"
-#include "KinoSearch/Search/NoMatchQuery.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/QueryParser.h"
-#include "KinoSearch/Search/SortSpec.h"
-#include "KinoSearch/Search/TopDocs.h"
-#include "KinoSearch/Search/Compiler.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Collector.h"
+#include "Lucy/Search/Hits.h"
+#include "Lucy/Search/NoMatchQuery.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/QueryParser.h"
+#include "Lucy/Search/SortSpec.h"
+#include "Lucy/Search/TopDocs.h"
+#include "Lucy/Search/Compiler.h"
Searcher*
Searcher_init(Searcher *self, Schema *schema)
Modified: incubator/lucy/trunk/core/Lucy/Search/Searcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Searcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Searcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Searcher.cfh Thu Nov 4 05:36:36 2010
@@ -19,11 +19,11 @@ parcel Lucy;
/** Base class for searching collections of documents.
*
* Abstract base class for objects which search. Core subclasses include
- * L<KinoSearch::Search::IndexSearcher> and
- * L<KinoSearch::Search::PolySearcher>.
+ * L<Lucy::Search::IndexSearcher> and
+ * L<Lucy::Search::PolySearcher>.
*/
-class KinoSearch::Search::Searcher inherits KinoSearch::Object::Obj {
+class Lucy::Search::Searcher inherits Lucy::Object::Obj {
Schema *schema;
QueryParser *qparser;
@@ -71,7 +71,7 @@ class KinoSearch::Search::Searcher inher
* hits 21-30, assuming that 30 hits can be found.
* @param num_wanted The number of hits you would like to see after
* <code>offset</code> is taken into account.
- * @param sort_spec A L<KinoSearch::Search::SortSpec>, which will affect
+ * @param sort_spec A L<Lucy::Search::SortSpec>, which will affect
* how results are ranked and returned.
*/
public incremented Hits*
@@ -79,7 +79,7 @@ class KinoSearch::Search::Searcher inher
uint32_t num_wanted = 10, SortSpec *sort_spec = NULL);
/** Iterate over hits, feeding them into a
- * L<Collector|KinoSearch::Search::Collector>.
+ * L<Collector|Lucy::Search::Collector>.
*
* @param query A Query.
* @param collector A Collector.
Modified: incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_SERIESMATCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/SeriesMatcher.h"
+#include "Lucy/Search/SeriesMatcher.h"
SeriesMatcher*
SeriesMatcher_new(VArray *matchers, I32Array *offsets)
Modified: incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SeriesMatcher.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Concatenates multiple Matcher iterators.
*/
-class KinoSearch::Search::SeriesMatcher inherits KinoSearch::Search::Matcher {
+class Lucy::Search::SeriesMatcher inherits Lucy::Search::Matcher {
I32Array *offsets;
VArray *matchers;
Modified: incubator/lucy/trunk/core/Lucy/Search/SortRule.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SortRule.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SortRule.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SortRule.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_SORTRULE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
int32_t SortRule_FIELD = 0;
int32_t SortRule_SCORE = 1;
Modified: incubator/lucy/trunk/core/Lucy/Search/SortRule.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SortRule.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SortRule.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SortRule.cfh Thu Nov 4 05:36:36 2010
@@ -19,11 +19,11 @@ parcel Lucy;
/** Element of a SortSpec.
*
* SortRules are the building blocks used to assemble
- * L<SortSpecs|KinoSearch::Search::SortSpec>; each SortRule defines a single
+ * L<SortSpecs|Lucy::Search::SortSpec>; each SortRule defines a single
* level of sorting. For example, sorting first by "category" then by score
* requires a SortSpec with two SortRule elements.
*/
-class KinoSearch::Search::SortRule inherits KinoSearch::Object::Obj {
+class Lucy::Search::SortRule inherits Lucy::Object::Obj {
int32_t type;
CharBuf *field;
Modified: incubator/lucy/trunk/core/Lucy/Search/SortSpec.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SortSpec.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SortSpec.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SortSpec.c Thu Nov 4 05:36:36 2010
@@ -15,17 +15,17 @@
*/
#define C_LUCY_SORTSPEC
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/SortSpec.h"
-#include "KinoSearch/Index/IndexReader.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/SortUtils.h"
+#include "Lucy/Search/SortSpec.h"
+#include "Lucy/Index/IndexReader.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/SortUtils.h"
SortSpec*
SortSpec_new(VArray *rules)
Modified: incubator/lucy/trunk/core/Lucy/Search/SortSpec.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/SortSpec.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/SortSpec.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/SortSpec.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
*
* By default, searches return results in order of relevance; SortSpec allows
* you to indicate an alternate order via an array of
- * L<SortRules|KinoSearch::Search::SortRule>.
+ * L<SortRules|Lucy::Search::SortRule>.
*
* Fields you wish to sort against must be <code>sortable</code>.
*
@@ -28,7 +28,7 @@ parcel Lucy;
* sort-by-doc rule as the last SortRule.
*/
-class KinoSearch::Search::SortSpec inherits KinoSearch::Object::Obj {
+class Lucy::Search::SortSpec inherits Lucy::Object::Obj {
VArray *rules;
Modified: incubator/lucy/trunk/core/Lucy/Search/Span.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Span.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Span.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Span.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_SPAN
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Span.h"
+#include "Lucy/Search/Span.h"
Span*
Span_new(int32_t offset, int32_t length, float weight)
Modified: incubator/lucy/trunk/core/Lucy/Search/Span.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Span.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Span.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Span.cfh Thu Nov 4 05:36:36 2010
@@ -26,7 +26,7 @@ parcel Lucy;
* within an array of tokens, for example -- in which case the start and
* offset might be measured in token positions.
*/
-class KinoSearch::Search::Span inherits KinoSearch::Object::Obj {
+class Lucy::Search::Span inherits Lucy::Object::Obj {
int32_t offset;
int32_t length;
Modified: incubator/lucy/trunk/core/Lucy/Search/TermQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TermQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TermQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TermQuery.c Thu Nov 4 05:36:36 2010
@@ -16,23 +16,23 @@
#define C_LUCY_TERMQUERY
#define C_LUCY_TERMCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/PostingListReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Index/TermVector.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Compiler.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Search/TermScorer.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/PostingListReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Index/TermVector.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Compiler.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Search/TermScorer.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
TermQuery*
TermQuery_new(const CharBuf *field, const Obj *term)
Modified: incubator/lucy/trunk/core/Lucy/Search/TermQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TermQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TermQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TermQuery.cfh Thu Nov 4 05:36:36 2010
@@ -19,11 +19,11 @@ parcel Lucy;
/** Query which matches individual terms.
*
- * TermQuery is a subclass of L<KinoSearch::Search::Query> for matching
+ * TermQuery is a subclass of L<Lucy::Search::Query> for matching
* individual terms in a specific field.
*/
-class KinoSearch::Search::TermQuery inherits KinoSearch::Search::Query
+class Lucy::Search::TermQuery inherits Lucy::Search::Query
: dumpable {
CharBuf *field;
@@ -68,7 +68,7 @@ class KinoSearch::Search::TermQuery inhe
Destroy(TermQuery *self);
}
-class KinoSearch::Search::TermCompiler inherits KinoSearch::Search::Compiler {
+class Lucy::Search::TermCompiler inherits Lucy::Search::Compiler {
float idf;
float raw_weight;
float query_norm_factor;
Modified: incubator/lucy/trunk/core/Lucy/Search/TermScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TermScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TermScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TermScorer.c Thu Nov 4 05:36:36 2010
@@ -15,13 +15,13 @@
*/
#define C_LUCY_TERMSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/TermScorer.h"
-#include "KinoSearch/Index/Posting.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Search/Compiler.h"
+#include "Lucy/Search/TermScorer.h"
+#include "Lucy/Index/Posting.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Search/Compiler.h"
TermScorer*
TermScorer_init(TermScorer *self, Similarity *similarity, PostingList *plist,
Modified: incubator/lucy/trunk/core/Lucy/Search/TermScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TermScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TermScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TermScorer.cfh Thu Nov 4 05:36:36 2010
@@ -22,7 +22,7 @@ parcel Lucy;
* Each subclass of Posting is associated with a corresponding subclass of
* TermScorer.
*/
-class KinoSearch::Search::TermScorer inherits KinoSearch::Search::Matcher {
+class Lucy::Search::TermScorer inherits Lucy::Search::Matcher {
float weight;
Compiler *compiler;
Modified: incubator/lucy/trunk/core/Lucy/Search/TopDocs.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TopDocs.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TopDocs.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TopDocs.c Thu Nov 4 05:36:36 2010
@@ -15,15 +15,15 @@
*/
#define C_LUCY_TOPDOCS
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/TopDocs.h"
-#include "KinoSearch/Index/IndexReader.h"
-#include "KinoSearch/Index/Lexicon.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Search/SortSpec.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Search/TopDocs.h"
+#include "Lucy/Index/IndexReader.h"
+#include "Lucy/Index/Lexicon.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Search/SortSpec.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
TopDocs*
TopDocs_new(VArray *match_docs, uint32_t total_hits)
Modified: incubator/lucy/trunk/core/Lucy/Search/TopDocs.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/TopDocs.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/TopDocs.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/TopDocs.cfh Thu Nov 4 05:36:36 2010
@@ -21,7 +21,7 @@ parcel Lucy;
* A TopDocs object encapsulates the highest-scoring N documents and their
* associated scores.
*/
-class KinoSearch::Search::TopDocs inherits KinoSearch::Object::Obj {
+class Lucy::Search::TopDocs inherits Lucy::Object::Obj {
VArray *match_docs;
uint32_t total_hits;
Modified: incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.c Thu Nov 4 05:36:36 2010
@@ -16,15 +16,15 @@
#define C_LUCY_COMPOUNDFILEREADER
#define C_LUCY_CFREADERDIRHANDLE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Store/CompoundFileReader.h"
-#include "KinoSearch/Store/CompoundFileWriter.h"
-#include "KinoSearch/Store/FileHandle.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Util/IndexFileNames.h"
-#include "KinoSearch/Util/Json.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Store/CompoundFileReader.h"
+#include "Lucy/Store/CompoundFileWriter.h"
+#include "Lucy/Store/FileHandle.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Util/IndexFileNames.h"
+#include "Lucy/Util/Json.h"
+#include "Lucy/Util/StringHelper.h"
CompoundFileReader*
CFReader_open(Folder *folder)
Modified: incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/CompoundFileReader.cfh Thu Nov 4 05:36:36 2010
@@ -30,8 +30,8 @@ parcel Lucy;
* available filehandles.
*/
-class KinoSearch::Store::CompoundFileReader cnick CFReader
- inherits KinoSearch::Store::Folder {
+class Lucy::Store::CompoundFileReader cnick CFReader
+ inherits Lucy::Store::Folder {
Folder *real_folder;
Hash *records;
@@ -88,8 +88,8 @@ class KinoSearch::Store::CompoundFileRea
/** DirHandle for CompoundFileReader.
*/
-class KinoSearch::Store::CFReaderDirHandle cnick CFReaderDH
- inherits KinoSearch::Store::DirHandle {
+class Lucy::Store::CFReaderDirHandle cnick CFReaderDH
+ inherits Lucy::Store::DirHandle {
CompoundFileReader *cf_reader;
VArray *elems;
Modified: incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.c Thu Nov 4 05:36:36 2010
@@ -15,14 +15,14 @@
*/
#define C_LUCY_COMPOUNDFILEWRITER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Store/CompoundFileWriter.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/IndexFileNames.h"
-#include "KinoSearch/Util/Json.h"
+#include "Lucy/Store/CompoundFileWriter.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/IndexFileNames.h"
+#include "Lucy/Util/Json.h"
int32_t CFWriter_current_file_format = 2;
Modified: incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh Thu Nov 4 05:36:36 2010
@@ -29,8 +29,8 @@ parcel Lucy;
* Any given directory may only be consolidated once.
*/
-class KinoSearch::Store::CompoundFileWriter cnick CFWriter
- inherits KinoSearch::Object::Obj {
+class Lucy::Store::CompoundFileWriter cnick CFWriter
+ inherits Lucy::Object::Obj {
Folder *folder;
Modified: incubator/lucy/trunk/core/Lucy/Store/DirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/DirHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/DirHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/DirHandle.c Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
#define C_LUCY_DIRHANDLE
#include <stdarg.h>
-#include "KinoSearch/Util/ToolSet.h"
-#include "KinoSearch/Store/DirHandle.h"
+#include "Lucy/Util/ToolSet.h"
+#include "Lucy/Store/DirHandle.h"
DirHandle*
DH_init(DirHandle *self, const CharBuf *dir)
Modified: incubator/lucy/trunk/core/Lucy/Store/DirHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/DirHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/DirHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/DirHandle.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** Iterate over the files in a directory.
*/
-abstract class KinoSearch::Store::DirHandle cnick DH
- inherits KinoSearch::Object::Obj {
+abstract class Lucy::Store::DirHandle cnick DH
+ inherits Lucy::Object::Obj {
CharBuf *dir;
CharBuf *entry;
Modified: incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.c Thu Nov 4 05:36:36 2010
@@ -21,11 +21,11 @@
#include <errno.h>
#include <sys/stat.h>
-#include "KinoSearch/Util/ToolSet.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/VArray.h"
-#include "KinoSearch/Store/FSDirHandle.h"
+#include "Lucy/Util/ToolSet.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/VArray.h"
+#include "Lucy/Store/FSDirHandle.h"
#ifdef CHY_HAS_SYS_TYPES_H
#include <sys/types.h>
Modified: incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSDirHandle.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** File system DirHandle.
*/
-class KinoSearch::Store::FSDirHandle cnick FSDH
- inherits KinoSearch::Store::DirHandle {
+class Lucy::Store::FSDirHandle cnick FSDH
+ inherits Lucy::Store::DirHandle {
void *sys_dirhandle;
void *sys_dir_entry;
Modified: incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
#define C_LUCY_FSFILEHANDLE
#define C_LUCY_FILEWINDOW
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <errno.h>
#include <stdio.h>
@@ -36,8 +36,8 @@
#error "No support for memory mapped files"
#endif
-#include "KinoSearch/Store/FSFileHandle.h"
-#include "KinoSearch/Store/FileWindow.h"
+#include "Lucy/Store/FSFileHandle.h"
+#include "Lucy/Store/FileWindow.h"
// Convert FileHandle flags to POSIX flags.
static INLINE int
Modified: incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** File system FileHandle.
*/
-class KinoSearch::Store::FSFileHandle cnick FSFH
- inherits KinoSearch::Store::FileHandle {
+class Lucy::Store::FSFileHandle cnick FSFH
+ inherits Lucy::Store::FileHandle {
int fd;
void *win_fhandle;
Modified: incubator/lucy/trunk/core/Lucy/Store/FSFolder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSFolder.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSFolder.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSFolder.c Thu Nov 4 05:36:36 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_FSFOLDER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <ctype.h>
#include <errno.h>
@@ -37,14 +37,14 @@
#include <direct.h>
#endif
-#include "KinoSearch/Store/FSFolder.h"
-#include "KinoSearch/Store/CompoundFileReader.h"
-#include "KinoSearch/Store/CompoundFileWriter.h"
-#include "KinoSearch/Store/FSDirHandle.h"
-#include "KinoSearch/Store/FSFileHandle.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/IndexFileNames.h"
+#include "Lucy/Store/FSFolder.h"
+#include "Lucy/Store/CompoundFileReader.h"
+#include "Lucy/Store/CompoundFileWriter.h"
+#include "Lucy/Store/FSDirHandle.h"
+#include "Lucy/Store/FSFileHandle.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/IndexFileNames.h"
// Return a CharBuf containing a platform-specific absolute filepath.
static CharBuf*
Modified: incubator/lucy/trunk/core/Lucy/Store/FSFolder.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSFolder.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSFolder.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSFolder.cfh Thu Nov 4 05:36:36 2010
@@ -18,11 +18,11 @@ parcel Lucy;
/** File System implementation of Folder.
*
- * Implementation of L<KinoSearch::Store::Folder> using a single file system
+ * Implementation of L<Lucy::Store::Folder> using a single file system
* directory and multiple files.
*/
-class KinoSearch::Store::FSFolder inherits KinoSearch::Store::Folder {
+class Lucy::Store::FSFolder inherits Lucy::Store::Folder {
inert incremented FSFolder*
new(const CharBuf *path);
Modified: incubator/lucy/trunk/core/Lucy/Store/FileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FileHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FileHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FileHandle.c Thu Nov 4 05:36:36 2010
@@ -17,9 +17,9 @@
#include <stdarg.h>
#define C_LUCY_FILEHANDLE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Store/FileHandle.h"
+#include "Lucy/Store/FileHandle.h"
int32_t FH_object_count = 0;
Modified: incubator/lucy/trunk/core/Lucy/Store/FileHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FileHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FileHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FileHandle.cfh Thu Nov 4 05:36:36 2010
@@ -32,8 +32,8 @@ parcel Lucy;
* already exists.
*/
-abstract class KinoSearch::Store::FileHandle cnick FH
- inherits KinoSearch::Object::Obj {
+abstract class Lucy::Store::FileHandle cnick FH
+ inherits Lucy::Object::Obj {
CharBuf *path;
uint32_t flags;
Modified: incubator/lucy/trunk/core/Lucy/Store/FileWindow.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FileWindow.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FileWindow.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FileWindow.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_FILEWINDOW
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Store/FileWindow.h"
+#include "Lucy/Store/FileWindow.h"
FileWindow*
FileWindow_new()
Modified: incubator/lucy/trunk/core/Lucy/Store/FileWindow.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FileWindow.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FileWindow.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FileWindow.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** A portion of a file, viewed as an array of bytes.
*/
-class KinoSearch::Store::FileWindow inherits KinoSearch::Object::Obj {
+class Lucy::Store::FileWindow inherits Lucy::Object::Obj {
char *buf;
int64_t offset;
Modified: incubator/lucy/trunk/core/Lucy/Store/Folder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/Folder.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/Folder.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/Folder.c Thu Nov 4 05:36:36 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_FOLDER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <ctype.h>
#include <limits.h>
@@ -23,14 +23,14 @@
#define SIZE_MAX ((size_t)-1)
#endif
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/CompoundFileReader.h"
-#include "KinoSearch/Store/CompoundFileWriter.h"
-#include "KinoSearch/Store/DirHandle.h"
-#include "KinoSearch/Store/FileHandle.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/IndexFileNames.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/CompoundFileReader.h"
+#include "Lucy/Store/CompoundFileWriter.h"
+#include "Lucy/Store/DirHandle.h"
+#include "Lucy/Store/FileHandle.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/IndexFileNames.h"
Folder*
Folder_init(Folder *self, const CharBuf *path)
Modified: incubator/lucy/trunk/core/Lucy/Store/Folder.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/Folder.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/Folder.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/Folder.cfh Thu Nov 4 05:36:36 2010
@@ -23,10 +23,10 @@ parcel Lucy;
* a key-value pair from a hash, or something else.
*
* The archetypal implementation of Folder,
- * L<FSFolder|KinoSearch::Store::FSFolder>, represents a directory on
+ * L<FSFolder|Lucy::Store::FSFolder>, represents a directory on
* the file system holding a collection of files.
*/
-abstract class KinoSearch::Store::Folder inherits KinoSearch::Object::Obj {
+abstract class Lucy::Store::Folder inherits Lucy::Object::Obj {
CharBuf *path;
Hash *entries;
Modified: incubator/lucy/trunk/core/Lucy/Store/InStream.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/InStream.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/InStream.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/InStream.c Thu Nov 4 05:36:36 2010
@@ -16,14 +16,14 @@
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/FileHandle.h"
-#include "KinoSearch/Store/FSFileHandle.h"
-#include "KinoSearch/Store/FileWindow.h"
-#include "KinoSearch/Store/RAMFile.h"
-#include "KinoSearch/Store/RAMFileHandle.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/FileHandle.h"
+#include "Lucy/Store/FSFileHandle.h"
+#include "Lucy/Store/FileWindow.h"
+#include "Lucy/Store/RAMFile.h"
+#include "Lucy/Store/RAMFileHandle.h"
// Inlined version of InStream_Tell.
static INLINE int64_t
Modified: incubator/lucy/trunk/core/Lucy/Store/InStream.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/InStream.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/InStream.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/InStream.cfh Thu Nov 4 05:36:36 2010
@@ -31,7 +31,7 @@ parcel Lucy;
* practice is safe because InStreams do not modify or rely upon the file
* position or other state within the FileHandle.
*/
-class KinoSearch::Store::InStream inherits KinoSearch::Object::Obj {
+class Lucy::Store::InStream inherits Lucy::Object::Obj {
int64_t offset;
int64_t len;
Modified: incubator/lucy/trunk/core/Lucy/Store/Lock.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/Lock.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/Lock.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/Lock.c Thu Nov 4 05:36:36 2010
@@ -16,18 +16,18 @@
#define C_LUCY_LOCK
#define C_LUCY_LOCKFILELOCK
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
-#include "KinoSearch/Store/Lock.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Json.h"
-#include "KinoSearch/Util/ProcessID.h"
-#include "KinoSearch/Util/Sleep.h"
+#include "Lucy/Store/Lock.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Json.h"
+#include "Lucy/Util/ProcessID.h"
+#include "Lucy/Util/Sleep.h"
Lock*
Lock_init(Lock *self, Folder *folder, const CharBuf *name,
Modified: incubator/lucy/trunk/core/Lucy/Store/Lock.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/Lock.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/Lock.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Store/Lock.cfh Thu Nov 4 05:36:36 2010
@@ -27,7 +27,7 @@ parcel Lucy;
* help clear away stale locks.
*/
-abstract class KinoSearch::Store::Lock inherits KinoSearch::Object::Obj {
+abstract class Lucy::Store::Lock inherits Lucy::Object::Obj {
Folder *folder;
CharBuf *name;
@@ -110,8 +110,8 @@ abstract class KinoSearch::Store::Lock i
Destroy(Lock *self);
}
-class KinoSearch::Store::LockFileLock cnick LFLock
- inherits KinoSearch::Store::Lock {
+class Lucy::Store::LockFileLock cnick LFLock
+ inherits Lucy::Store::Lock {
CharBuf *link_path;
@@ -157,10 +157,10 @@ class KinoSearch::Store::LockFileLock cn
/** Lock exception.
*
- * LockErr is a subclass of L<Err|KinoSearch::Object::Err> which indicates
+ * LockErr is a subclass of L<Err|Lucy::Object::Err> which indicates
* that a file locking problem occurred.
*/
-class KinoSearch::Store::LockErr inherits KinoSearch::Object::Err {
+class Lucy::Store::LockErr inherits Lucy::Object::Err {
public inert incremented LockErr*
new(CharBuf *message);
Modified: incubator/lucy/trunk/core/Lucy/Store/LockFactory.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/LockFactory.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/LockFactory.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/LockFactory.c Thu Nov 4 05:36:36 2010
@@ -15,16 +15,16 @@
*/
#define C_LUCY_LOCKFACTORY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
-#include "KinoSearch/Store/LockFactory.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/Lock.h"
-#include "KinoSearch/Store/SharedLock.h"
+#include "Lucy/Store/LockFactory.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/Lock.h"
+#include "Lucy/Store/SharedLock.h"
LockFactory*
LockFact_new(Folder *folder, const CharBuf *host)