diff -r a5fbfefd615f -r 6547bf8ca13a searchengine/cpix/tsrc/cpixunittest/group/bld.inf
--- a/searchengine/cpix/tsrc/cpixunittest/group/bld.inf	Fri Jun 11 14:43:47 2010 +0300
+++ b/searchengine/cpix/tsrc/cpixunittest/group/bld.inf	Mon Jun 28 10:34:53 2010 +0530
@@ -17,6 +17,13 @@
 PRJ_TESTEXPORTS
 
 //
+// CPix Localization Resources
+//
+
+../../../cpix/data/resource/analyzer.loc     /epoc32/winscw/c/Data/cpixunittestcorpus/resource/analyzer.loc
+../../../cpix/data/resource/thaidict.sm      /epoc32/winscw/c/Data/cpixunittestcorpus/resource/thaidict.sm
+
+//
 // Test Definition Files (For ITK IOCapture testing)
 //
 
@@ -224,18 +231,32 @@
 ../data/cpixunittest/whitebox/delta/wrn-complete/startStage_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/whitebox/delta/wrn-complete/startStage_exp_out.txt
 ../data/cpixunittest/whitebox/delta/wrn-complete/recoveredStage_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/whitebox/delta/wrn-complete/recoveredStage_exp_out.txt
 
-
-
 ../data/cpixunittest/analysis/parsing_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/parsing_exp_out.txt
 ../data/cpixunittest/analysis/switchParsing_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/switchParsing_exp_out.txt
 ../data/cpixunittest/analysis/usage_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/usage_exp_out.txt
+
+../data/cpixunittest/analysis/loc/currentLocale_C_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/currentLocale_C_exp_out.txt
+../data/cpixunittest/analysis/loc/en_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/en_exp_out.txt
+../data/cpixunittest/analysis/loc/th_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/th_exp_out.txt
+../data/cpixunittest/analysis/loc/ch_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/ch_exp_out.txt
+../data/cpixunittest/analysis/loc/ko_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/ko_exp_out.txt
+../data/cpixunittest/analysis/loc/jp_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/loc/jp_exp_out.txt
+
 ../data/cpixunittest/analysis/whitebox/analyzer_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/analyzer_exp_out.txt
-../data/cpixunittest/analysis/whitebox/parsing_exp_out.txt 		/epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/parsing_exp_out.txt
-../data/cpixunittest/analysis/whitebox/parsing2_exp_out.txt 		/epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/parsing2_exp_out.txt
+../data/cpixunittest/analysis/whitebox/parsing_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/parsing_exp_out.txt
+../data/cpixunittest/analysis/whitebox/parsing2_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/parsing2_exp_out.txt
 ../data/cpixunittest/analysis/whitebox/parsingerrors_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/parsingerrors_exp_out.txt
 ../data/cpixunittest/analysis/whitebox/switchAnalyzer_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/switchAnalyzer_exp_out.txt
+../data/cpixunittest/analysis/whitebox/localeSwitchAnalyzer_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/localeSwitchAnalyzer_exp_out.txt
 ../data/cpixunittest/analysis/whitebox/tokenization_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/tokenization_exp_out.txt
 
+../data/cpixunittest/analysis/whitebox/loc/currentLocale_C_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/currentLocale_C_exp_out.txt
+../data/cpixunittest/analysis/whitebox/loc/en_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/en_exp_out.txt
+../data/cpixunittest/analysis/whitebox/loc/th_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/th_exp_out.txt
+../data/cpixunittest/analysis/whitebox/loc/ch_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/ch_exp_out.txt
+../data/cpixunittest/analysis/whitebox/loc/ko_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/ko_exp_out.txt
+../data/cpixunittest/analysis/whitebox/loc/jp_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/analysis/whitebox/loc/jp_exp_out.txt
+
 ../data/cpixunittest/utf8/utf8_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/utf8/utf8_exp_out.txt
 
 ../data/cpixunittest/maps/searchMaps_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/maps/searchMaps_exp_out.txt
@@ -285,6 +306,12 @@
 ../data/cpixunittest/utf8path/harvest_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/utf8path/harvest_exp_out.txt
 ../data/cpixunittest/utf8path/search_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/utf8path/search_exp_out.txt
 
+../data/cpixunittest/prefixopt/unoptimized_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/prefixopt/unoptimized_out.txt
+../data/cpixunittest/prefixopt/optimized_exp_out.txt /epoc32/winscw/c/Data/cpixunittest/prefixopt/optimized_exp_out.txt
+
+
+
+
 
 // 
 // Corpus files
@@ -360,11 +387,45 @@
 "../data/cpixunittestcorpus/query/query8.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/query/query8.txt"
 "../data/cpixunittestcorpus/query/query9.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/query/query9.txt"
 
-"../data/cpixunittestcorpus/pdf/ctutor.pdf"                             "/epoc32/winscw/c/Data/cpixunittestcorpus/pdf/ctutor.pdf"
-"../data/cpixunittestcorpus/pdf/Empty.pdf"                              "/epoc32/winscw/c/Data/cpixunittestcorpus/pdf/Empty.pdf"
-"../data/cpixunittestcorpus/pdf/geology.pdf"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/pdf/geology.pdf"
-"../data/cpixunittestcorpus/pdf/samplepdf.pdf"                          "/epoc32/winscw/c/Data/cpixunittestcorpus/pdf/samplepdf.pdf"
-"../data/cpixunittestcorpus/pdf/windjack.pdf"                           "/epoc32/winscw/c/Data/cpixunittestcorpus/pdf/windjack.PDF"
+"../data/cpixunittestcorpus/loc/fr/1.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/fr/1.txt"
+"../data/cpixunittestcorpus/loc/fr/2.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/fr/2.txt"
+"../data/cpixunittestcorpus/loc/fr/3.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/fr/3.txt"
+"../data/cpixunittestcorpus/loc/fr/4.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/fr/4.txt"
+
+"../data/cpixunittestcorpus/loc/he/1.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/he/1.txt"
+"../data/cpixunittestcorpus/loc/he/2.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/he/2.txt"
+"../data/cpixunittestcorpus/loc/he/3.txt"                            "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/he/3.txt"
+"../data/cpixunittestcorpus/loc/he/4.txt" 
+
+"../data/cpixunittestcorpus/loc/th/1.txt"                             "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/th/1.txt"
+"../data/cpixunittestcorpus/loc/th/2.txt"                             "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/th/2.txt"
+"../data/cpixunittestcorpus/loc/th/3.txt"                             "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/th/3.txt"
+"../data/cpixunittestcorpus/loc/th/4.txt"                             "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/th/4.txt"
+
+"../data/cpixunittestcorpus/loc/ch_prc/1.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_prc/1.txt"
+"../data/cpixunittestcorpus/loc/ch_prc/2.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_prc/2.txt"
+"../data/cpixunittestcorpus/loc/ch_prc/3.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_prc/3.txt"
+"../data/cpixunittestcorpus/loc/ch_prc/4.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_prc/4.txt"
+
+"../data/cpixunittestcorpus/loc/ch_simple/1.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_simple/1.txt"
+"../data/cpixunittestcorpus/loc/ch_simple/2.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_simple/2.txt"
+"../data/cpixunittestcorpus/loc/ch_simple/3.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_simple/3.txt"
+"../data/cpixunittestcorpus/loc/ch_simple/4.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_simple/4.txt"
+
+"../data/cpixunittestcorpus/loc/ch_hk/1.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_hk/1.txt"
+"../data/cpixunittestcorpus/loc/ch_hk/2.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_hk/2.txt"
+"../data/cpixunittestcorpus/loc/ch_hk/3.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_hk/3.txt"
+"../data/cpixunittestcorpus/loc/ch_hk/4.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_hk/4.txt"
+
+"../data/cpixunittestcorpus/loc/ch_tw/1.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_tw/1.txt"
+"../data/cpixunittestcorpus/loc/ch_tw/2.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_tw/2.txt"
+"../data/cpixunittestcorpus/loc/ch_tw/3.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_tw/3.txt"
+"../data/cpixunittestcorpus/loc/ch_tw/4.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/ch_tw/4.txt"
+
+"../data/cpixunittestcorpus/loc/jp/1.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/jp/1.txt"
+"../data/cpixunittestcorpus/loc/jp/2.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/jp/2.txt"
+"../data/cpixunittestcorpus/loc/jp/3.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/jp/3.txt"
+"../data/cpixunittestcorpus/loc/jp/4.txt"                         "/epoc32/winscw/c/Data/cpixunittestcorpus/loc/jp/4.txt"
 
 PRJ_TESTMMPFILES
 cpixunittest.mmp