[Clucene-cvs] SF.net SVN: clucene:[3010] branches/lucene2_3_2/src/core/CLucene/ queryParser

[<ust...@us...>]

Revision: 3010
          http://clucene.svn.sourceforge.net/clucene/?rev=3010&view=rev
Author:   ustramooner
Date:     2009-07-08 09:51:40 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
unnecessary const

Modified Paths:
--------------
    branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp
    branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.h
    branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp
    branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h

Modified: branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp	2009-06-11 17:34:23 UTC (rev 3009)
+++ branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp	2009-07-08 09:51:40 UTC (rev 3010)
@@ -28,7 +28,7 @@
 MultiFieldQueryParser::~MultiFieldQueryParser(){
 }
 
-Query* MultiFieldQueryParser::getFieldQuery(const TCHAR* field, const TCHAR* queryText, const int32_t slop){
+Query* MultiFieldQueryParser::getFieldQuery(const TCHAR* field, TCHAR* queryText, const int32_t slop){
 	if (field == NULL) {
 		vector<BooleanClause*> clauses;
 		for (int i = 0; fields[i]!=NULL; ++i) {

Modified: branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.h	2009-06-11 17:34:23 UTC (rev 3009)
+++ branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.h	2009-07-08 09:51:40 UTC (rev 3010)
@@ -63,8 +63,8 @@
 
 
 protected:
-  CL_NS(search)::Query* getFieldQuery(const TCHAR* field, const TCHAR* queryText, const int32_t slop);
-  CL_NS(search)::Query* getFieldQuery(const TCHAR* field, const TCHAR* queryText) { return getFieldQuery(field,queryText,0); }
+  CL_NS(search)::Query* getFieldQuery(const TCHAR* field, TCHAR* queryText, const int32_t slop);
+  CL_NS(search)::Query* getFieldQuery(const TCHAR* field, TCHAR* queryText) { return getFieldQuery(field,queryText,0); }
   CL_NS(search)::Query* getFuzzyQuery(const TCHAR* field, TCHAR* termStr, const float_t minSimilarity);
   CL_NS(search)::Query* getPrefixQuery(const TCHAR* field, TCHAR* termStr);
   CL_NS(search)::Query* getWildcardQuery(const TCHAR* field, TCHAR* termStr);

Modified: branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp	2009-06-11 17:34:23 UTC (rev 3009)
+++ branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp	2009-07-08 09:51:40 UTC (rev 3010)
@@ -295,10 +295,9 @@
   }
 }
 
-Query* QueryParser::getFieldQuery(const TCHAR* _field, const TCHAR* _queryText) {
+Query* QueryParser::getFieldQuery(const TCHAR* _field, TCHAR* queryText) {
   // Use the analyzer to get all the tokens, and then build a TermQuery,
   // PhraseQuery, or nothing based on the term count
-  TCHAR* queryText = (TCHAR*)_queryText; //TODO: this is horrible, getFieldQuery shouldn't consume queryText!!!!
 
   StringReader reader(queryText);
   TokenStream* source = analyzer->tokenStream(_field, &reader);
@@ -408,7 +407,7 @@
   }
 }
 
-Query* QueryParser::getFieldQuery(const TCHAR* _field, const TCHAR* queryText, const int32_t slop) {
+Query* QueryParser::getFieldQuery(const TCHAR* _field, TCHAR* queryText, const int32_t slop) {
   Query* query = getFieldQuery(_field, queryText);
 
   if (query) {

Modified: branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h	2009-06-11 17:34:23 UTC (rev 3009)
+++ branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h	2009-07-08 09:51:40 UTC (rev 3010)
@@ -320,7 +320,7 @@
   /**
   * @exception ParseException throw in overridden method to disallow
   */
-  virtual CL_NS(search)::Query* getFieldQuery(const TCHAR* _field, const TCHAR* queryText);
+  virtual CL_NS(search)::Query* getFieldQuery(const TCHAR* _field, TCHAR* queryText);
 
   /**
   * Base implementation delegates to {@link #getFieldQuery(String,String)}.
@@ -329,7 +329,7 @@
   *
   * @exception ParseException throw in overridden method to disallow
   */
-  virtual CL_NS(search)::Query* getFieldQuery(const TCHAR* _field, const TCHAR* queryText, const int32_t slop);
+  virtual CL_NS(search)::Query* getFieldQuery(const TCHAR* _field, TCHAR* queryText, const int32_t slop);
 
   /**
   * @exception ParseException throw in overridden method to disallow


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.