--- a/searchengine/oss/cl/clucene/src/clucene/search/searchheader.h	Thu Sep 02 21:37:32 2010 +0300
+++ b/searchengine/oss/cl/clucene/src/clucene/search/searchheader.h	Fri Sep 17 08:35:54 2010 +0300
@@ -24,9 +24,11 @@
 #include "CLucene/highlighter/SimpleFragmenter.h"
 #include "CLucene/highlighter/SimpleHTMLFormatter.h"
 #include "CLucene/analysis/standard/StandardAnalyzer.h"
-#define LCPIX_DEFAULT_FIELD   L"_aggregate"
 #define LCPIX_HL_EXCERPT_FIELD  L"_hlexcerpt"
 #define LCPIX_EXCERPT_FIELD   L"_excerpt"
+#if defined (__SYMBIAN32__)
+#include <e32std.h>
+#endif
 //#endif
 
 CL_NS_DEF(search)
@@ -172,8 +174,9 @@
 		CL_NS2(search,highlight)::SimpleHTMLFormatter hl_formatter;
 		
 		CL_NS2(search,highlight)::SimpleFragmenter hl_frag;
-        
-		CL_NS2(analysis,standard)::StandardAnalyzer hl_analyzer;
+#if defined (__SYMBIAN32__)        
+		TLanguage lang;
+#endif		
 //#endif		
     public:
 		Hits(Searcher* s, Query* q, Filter* f, const Sort* sort=NULL);
@@ -206,6 +209,13 @@
 		void addToFront(HitDoc* hitDoc);
 	    
 		void remove(const HitDoc* hitDoc);
+		
+		/* Get the tokenstream for Highlighting.
+		 * @ text Text to be analyzed
+		 * @ result wchar double pointer to return highlighted text
+		 * @ firstline Flag for checking first line or Excerpt field.
+		 */			
+		void getHighlightedText(CL_NS(document)::Document* document);
 
   };
 
@@ -292,9 +302,7 @@
       * Searcher#search(Query,Filter,Sort)} instead.
       */
 	  	virtual TopFieldDocs* _search(Query* query, Filter* filter, const int32_t n, const Sort* sort) = 0;
-//#ifdef USE_HIGHLIGHTER	  	
-	  	virtual void getrewritten(int32_t n, Query* original, Query* rwQuery[])= 0;
-//#endif	  	
+	  	
    };