[Clucene-cvs] SF.net SVN: clucene:[2966] branches/lucene2_3_2/src/contribs-lib/CLucene

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

Revision: 2966
          http://clucene.svn.sourceforge.net/clucene/?rev=2966&view=rev
Author:   ustramooner
Date:     2009-03-29 10:56:58 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
fixed compile errors relating to new branch code

Modified Paths:
--------------
    branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp
    branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp
    branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp
    branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp
    branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp

Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp	2009-03-29 10:56:10 UTC (rev 2965)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp	2009-03-29 10:56:58 UTC (rev 2966)
@@ -31,7 +31,12 @@
 	if ( _tcscmp(lang, _T("cjk"))==0 ){
 		ret = _CLNEW CL_NS2(analysis,cjk)::CJKTokenizer(reader);
 	}else{
-		ret = _CLNEW StandardTokenizer(reader);
+    BufferedReader* bufferedReader = reader->__asBufferedReader();
+    if ( bufferedReader == NULL )
+      ret =  _CLNEW StandardTokenizer( _CLNEW FilteredBufferedReader(reader, false), true );
+    else
+      ret = _CLNEW StandardTokenizer(bufferedReader);
+
 		ret = _CLNEW StandardFilter(ret,true);
 
 		if ( stem )

Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp	2009-03-29 10:56:10 UTC (rev 2965)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp	2009-03-29 10:56:58 UTC (rev 2966)
@@ -1,6 +1,6 @@
 #include "CLucene/_ApiHeader.h"
 #include "CJKAnalyzer.h"
-#include "CLucene/util/Reader.h"
+#include "CLucene/util/CLStreams.h"
 
 CL_NS_DEF2(analysis,cjk)
 CL_NS_USE(analysis)
@@ -36,7 +36,7 @@
         offset++;
 
         if (bufferIndex >= dataLen) {
-            dataLen = input->read(ioBuffer);
+            dataLen = input->read(ioBuffer, 1, LUCENE_IO_BUFFER_SIZE);
             bufferIndex = 0;
         }
 

Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp	2009-03-29 10:56:10 UTC (rev 2965)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp	2009-03-29 10:56:58 UTC (rev 2966)
@@ -28,7 +28,7 @@
 #include "CLucene/analysis/AnalysisHeader.h"
 #include "CLucene/util/PriorityQueue.h"
 #include "CLucene/util/StringBuffer.h"
-#include "CLucene/util/Reader.h"
+#include "CLucene/util/CLStreams.h"
 
 CL_NS_DEF2(search,highlight)
 CL_NS_USE(analysis)

Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp	2009-03-29 10:56:10 UTC (rev 2965)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp	2009-03-29 10:56:58 UTC (rev 2966)
@@ -17,8 +17,8 @@
 #include "CLucene/_ApiHeader.h"
 #include "TokenSources.h"
 
-#include "CLucene/util/VoidList.h"
-#include "CLucene/util/Reader.h"
+#include "CLucene/util/VoidList.h"
+#include "CLucene/util/CLStreams.h"
 #include "CLucene/index/IndexReader.h"
 #include "CLucene/index/TermVector.h"
 #include "CLucene/document/Document.h"

Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp	2009-03-29 10:56:10 UTC (rev 2965)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp	2009-03-29 10:56:58 UTC (rev 2966)
@@ -7,6 +7,7 @@
 #include "CLucene/analysis/standard/StandardFilter.h"
 
 CL_NS_USE(analysis)
+CL_NS_USE(util)
 CL_NS_USE2(analysis,standard)
 
 CL_NS_DEF2(analysis,snowball)
@@ -35,8 +36,14 @@
   /** Constructs a {@link StandardTokenizer} filtered by a {@link
       StandardFilter}, a {@link LowerCaseFilter} and a {@link StopFilter}. */
   TokenStream* SnowballAnalyzer::tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader) {
-    TokenStream* result = _CLNEW StandardTokenizer(reader);
-	result = _CLNEW StandardFilter(result, true);
+    TokenStream* result = NULL;
+    BufferedReader* bufferedReader = reader->__asBufferedReader();
+    if ( bufferedReader == NULL )
+      result =  _CLNEW StandardTokenizer( _CLNEW FilteredBufferedReader(reader, false), true );
+    else
+      result = _CLNEW StandardTokenizer(bufferedReader);
+
+    result = _CLNEW StandardFilter(result, true);
     result = _CLNEW CL_NS(analysis)::LowerCaseFilter(result, true);
     if (stopSet != NULL)
       result = _CLNEW CL_NS(analysis)::StopFilter(result, true, stopSet);


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