--- a/searchengine/oss/cl/clucene/src/clucene/search/searchheader.h	Wed Aug 18 10:53:26 2010 +0300
+++ b/searchengine/oss/cl/clucene/src/clucene/search/searchheader.h	Thu Sep 02 21:37:32 2010 +0300
@@ -21,11 +21,12 @@
 #include "clucene/search/similarity.h"
 
 //#ifdef USE_HIGHLIGHTER
-//#include "CLucene/highlighter/SimpleFragmenter.h"
-//#include "CLucene/highlighter/SimpleHTMLFormatter.h"
-//#include "CLucene/analysis/standard/StandardAnalyzer.h"
-//
-//#define LCPIX_EXCERPT_FIELD   L"_excerpt"
+#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"
 //#endif
 
 CL_NS_DEF(search)
@@ -168,11 +169,11 @@
 		int32_t numDocs;			  // number cached
 		int32_t maxDocs;			  // max to cache
 //#ifdef USE_HIGHLIGHTER		
-//		CL_NS2(search,highlight)::SimpleHTMLFormatter hl_formatter;
-//		
-//		CL_NS2(search,highlight)::SimpleFragmenter hl_frag;
-//        
-//		CL_NS2(analysis,standard)::StandardAnalyzer hl_analyzer;
+		CL_NS2(search,highlight)::SimpleHTMLFormatter hl_formatter;
+		
+		CL_NS2(search,highlight)::SimpleFragmenter hl_frag;
+        
+		CL_NS2(analysis,standard)::StandardAnalyzer hl_analyzer;
 //#endif		
     public:
 		Hits(Searcher* s, Query* q, Filter* f, const Sort* sort=NULL);
@@ -292,7 +293,7 @@
       */
 	  	virtual TopFieldDocs* _search(Query* query, Filter* filter, const int32_t n, const Sort* sort) = 0;
 //#ifdef USE_HIGHLIGHTER	  	
-//	  	virtual Query* getrewritten(int32_t n, Query* original)= 0;
+	  	virtual void getrewritten(int32_t n, Query* original, Query* rwQuery[])= 0;
 //#endif	  	
    };