# HG changeset patch # User hgs # Date 1283745274 -19800 # Node ID e3c09e9691e09a478314c65ad272d8d614d65ace # Parent 7cda54f2d97fe910511aa01858b5e22ea54d1b01 201035 diff -r 7cda54f2d97f -r e3c09e9691e0 harvester/harvesterserver/src/cindexingmanager.cpp --- a/harvester/harvesterserver/src/cindexingmanager.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/harvester/harvesterserver/src/cindexingmanager.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -297,7 +297,9 @@ } // Always issue new wait - iTimer.After(iStatus, KDefaultWaitTime); + timenow += TTimeIntervalDays(1); + //iTimer.After(iStatus, KDefaultWaitTime); + iTimer.At(iStatus, timenow); SetActive(); } diff -r 7cda54f2d97f -r e3c09e9691e0 package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Mon Sep 06 09:24:34 2010 +0530 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 7cda54f2d97f -r e3c09e9691e0 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Mon Sep 06 09:24:34 2010 +0530 @@ -0,0 +1,1 @@ + diff -r 7cda54f2d97f -r e3c09e9691e0 qcpix/cpixsearch.pro --- a/qcpix/cpixsearch.pro Tue Aug 31 17:30:16 2010 +0530 +++ b/qcpix/cpixsearch.pro Mon Sep 06 09:24:34 2010 +0530 @@ -34,7 +34,7 @@ DEFINES += BUILD_DLL symbian{ - TARGET.CAPABILITY = CAP_GENERAL_DLL -DRM + TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0xE3B89364 TARGET.VID = VID_DEFAULT diff -r 7cda54f2d97f -r e3c09e9691e0 rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rom/bld.inf Mon Sep 06 09:24:34 2010 +0530 @@ -0,0 +1,35 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build information file +* +*/ + + +#include + + +PRJ_PLATFORMS + DEFAULT + +PRJ_EXPORTS +CPix_mw.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CPix_mw.iby) +../sis/cpixsearch_stub.sis /epoc32/data/z/system/install/cpixsearch_stub.sis +../cenrep/2001f6fb.cre /epoc32/winscw/c/private/10202be9/2001f6fb.cre +../cenrep/2001f6fb.cre /epoc32/data/z/private/10202be9/2001f6fb.cre + +PRJ_TESTMMPFILES + +PRJ_TESTEXPORTS +//To DO +// ids_testers.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ids_testers.iby) \ No newline at end of file diff -r 7cda54f2d97f -r e3c09e9691e0 searchengine/cpix/cpix/inc/private/document.h --- a/searchengine/cpix/cpix/inc/private/document.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchengine/cpix/cpix/inc/private/document.h Mon Sep 06 09:24:34 2010 +0530 @@ -76,7 +76,9 @@ bool isAggregated() const; - bool isFreeText() const; + bool isFreeText() const; + + bool isPhoneNumber() const; float_t boost() const; @@ -97,6 +99,8 @@ bool aggregate_; bool freeText_; + + bool phoneNumber_; }; diff -r 7cda54f2d97f -r e3c09e9691e0 searchengine/cpix/cpix/inc/public/cpixdoc.h --- a/searchengine/cpix/cpix/inc/public/cpixdoc.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchengine/cpix/cpix/inc/public/cpixdoc.h Mon Sep 06 09:24:34 2010 +0530 @@ -76,7 +76,11 @@ // index the value of the field without the stop word analyzer and // store it in _aggregate - cpix_FREE_TEXT = 128 + cpix_FREE_TEXT= 128, + + // index the value of the field using phonenumber analyser to split numbers + // and store it in _aggregate + cpix_PHONE_NUMBER = 256 }; typedef enum cpix_Index_ cpix_Index; diff -r 7cda54f2d97f -r e3c09e9691e0 searchengine/cpix/cpix/src/analyzer.cpp --- a/searchengine/cpix/cpix/src/analyzer.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searchengine/cpix/cpix/src/analyzer.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -273,6 +273,15 @@ stream_ = _CLNEW standard::StandardFilter(stream_,true); stream_ = _CLNEW LowerCaseFilter(stream_,true); } + // if it is phonenumber, use phone number analyser + else if(field->isPhoneNumber()) + { + lucene::analysis::Analyzer *PhoneNumerAnalyzer_; + + PhoneNumerAnalyzer_ = _CLNEW lucene::analysis::PhoneNumberAnalyzer(); + stream_ = PhoneNumerAnalyzer_->tokenStream( field->name(), reader_ ); + _CLDELETE(PhoneNumerAnalyzer_); + } else stream_ = analyzer_.tokenStream( field->name(), reader_ ); } diff -r 7cda54f2d97f -r e3c09e9691e0 searchengine/cpix/cpix/src/customanalyzer.cpp --- a/searchengine/cpix/cpix/src/customanalyzer.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searchengine/cpix/cpix/src/customanalyzer.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -652,6 +652,7 @@ {CPIX_TOKENIZER_KOREAN_QUERY,TokenizerFactoryCtor::create}, {CPIX_ANALYZER_STANDARD, AnalyzerWrapCtor::create}, + {CPIX_ANALYZER_PHONENUMBER, AnalyzerWrapCtor::create}, {CPIX_ANALYZER_DEFAULT, TokenStreamFactoryCtor::create}, // TODO: Add more Tokenizers/Analyzers diff -r 7cda54f2d97f -r e3c09e9691e0 searchengine/cpix/cpix/src/document.cpp --- a/searchengine/cpix/cpix/src/document.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searchengine/cpix/cpix/src/document.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -36,6 +36,7 @@ int configs) : own_(true), field_(0) { freeText_ = false; + phoneNumber_ = false; resolveConfig(configs); field_ = _CLNEW lucene::document::Field(name, value, configs); } @@ -46,6 +47,7 @@ int configs) : own_(true), field_(0) { freeText_ = false; + phoneNumber_ = false; resolveConfig(configs); field_ = _CLNEW lucene::document::Field(name, stream, configs); } @@ -70,6 +72,11 @@ freeText_ = true; configs &= (~cpix_FREE_TEXT); } + + if(configs & cpix_PHONE_NUMBER){ + phoneNumber_ = true; + configs &= (~cpix_PHONE_NUMBER); + } } @@ -81,6 +88,7 @@ aggregate_( aggregate ) { freeText_ = false; + phoneNumber_ = false; } Field::~Field() { @@ -118,6 +126,10 @@ return freeText_; } + bool Field::isPhoneNumber() const { + return phoneNumber_; + } + bool Field::isAggregated() const { return aggregate_; } diff -r 7cda54f2d97f -r e3c09e9691e0 searcher/searchclient/src/csearchdocument.cpp --- a/searcher/searchclient/src/csearchdocument.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searcher/searchclient/src/csearchdocument.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -246,10 +246,12 @@ return iBoost; } -#ifdef USE_HIGHLIGHTER + EXPORT_C void CSearchDocument::AddHLDisplayFieldL(const TDesC& aField) { +#ifdef USE_HIGHLIGHTER // Needs to be tokenised to rewrite the query, but should not be searchable so EAggregateNo. AddFieldL( _L( CPIX_HL_EXCERPT_FIELD ), aField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EAggregateNo ); +#endif } -#endif + diff -r 7cda54f2d97f -r e3c09e9691e0 searcher/searchserver/inc/csearchserversession.h --- a/searcher/searchserver/inc/csearchserversession.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searcher/searchserver/inc/csearchserversession.h Mon Sep 06 09:24:34 2010 +0530 @@ -108,6 +108,11 @@ void ContinueHouseKeeping(const RMessage2& aMessage); /** + * Continue housekeeping + */ + void ContinueHouseKeeping(); + + /** * Force housekeeping */ void ForceHouseKeeping(const RMessage2& aMessage); diff -r 7cda54f2d97f -r e3c09e9691e0 searcher/searchserver/src/cheartbeattimer.cpp --- a/searcher/searchserver/src/cheartbeattimer.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searcher/searchserver/src/cheartbeattimer.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -61,5 +61,5 @@ { if (iObserver) iObserver->HandleHeartBeatL(); - After(HEARTBEAT_PERIOD_USEC); + //After(HEARTBEAT_PERIOD_USEC); } diff -r 7cda54f2d97f -r e3c09e9691e0 searcher/searchserver/src/csearchserversession.cpp --- a/searcher/searchserver/src/csearchserversession.cpp Tue Aug 31 17:30:16 2010 +0530 +++ b/searcher/searchserver/src/csearchserversession.cpp Mon Sep 06 09:24:34 2010 +0530 @@ -252,30 +252,35 @@ case ESearchServerAdd: RECORDED_EXECUTION_BEGIN subsession->AddL(aMessage); + ContinueHouseKeeping(); RECORDED_EXECUTION_END("add") break; case ESearchServerUpdate: RECORDED_EXECUTION_BEGIN subsession->UpdateL(aMessage); + ContinueHouseKeeping(); RECORDED_EXECUTION_END("update") break; case ESearchServerDelete: RECORDED_EXECUTION_BEGIN subsession->DeleteL(aMessage); + ContinueHouseKeeping(); RECORDED_EXECUTION_END("delete") break; case ESearchServerReset: RECORDED_EXECUTION_BEGIN subsession->ResetL(aMessage); + ContinueHouseKeeping(); RECORDED_EXECUTION_END("reset") break; case ESearchServerFlush: RECORDED_EXECUTION_BEGIN subsession->FlushL(aMessage); + ContinueHouseKeeping(); RECORDED_EXECUTION_END("flush") break; @@ -458,6 +463,17 @@ } // ----------------------------------------------------------------------------- +// CSearchServerSession::ContinueHouseKeeping() +// Continue housekeeping +// ----------------------------------------------------------------------------- +// +void CSearchServerSession::ContinueHouseKeeping() + { + CServer2* server = const_cast( Server() ); + static_cast( server )->ContinueHouseKeeping(); + } + +// ----------------------------------------------------------------------------- // CSearchServerSession::ForceHouseKeeping() // Force housekeeping // ----------------------------------------------------------------------------- diff -r 7cda54f2d97f -r e3c09e9691e0 searcher/tsrc/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/searcher/tsrc/group/bld.inf Mon Sep 06 09:24:34 2010 +0530 @@ -0,0 +1,21 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + +#include "../RobustnessTest/group/bld.inf" +#include "../LogPlayer/group/bld.inf" +#include "../cpixsearchertest/group/bld.inf" \ No newline at end of file diff -r 7cda54f2d97f -r e3c09e9691e0 searchsrv_info/nokia_searchsrv_metadata/package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/searchsrv_info/nokia_searchsrv_metadata/package_definition.xml Mon Sep 06 09:24:34 2010 +0530 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r 7cda54f2d97f -r e3c09e9691e0 searchsrv_plat/cpix_framework_api/inc/cdocumentfield.h --- a/searchsrv_plat/cpix_framework_api/inc/cdocumentfield.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchsrv_plat/cpix_framework_api/inc/cdocumentfield.h Mon Sep 06 09:24:34 2010 +0530 @@ -61,7 +61,8 @@ EIndexNo = 16, EIndexTokenized = 32, EIndexUnTokenized = 64, - EIndexFreeText = 128 + EIndexFreeText = 128, + EIndexPhoneNumber = 256 }; /** diff -r 7cda54f2d97f -r e3c09e9691e0 searchsrv_plat/cpix_framework_api/inc/csearchdocument.h --- a/searchsrv_plat/cpix_framework_api/inc/csearchdocument.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchsrv_plat/cpix_framework_api/inc/csearchdocument.h Mon Sep 06 09:24:34 2010 +0530 @@ -182,7 +182,7 @@ */ IMPORT_C TReal32 Boost() const; -#ifdef USE_HIGHLIGHTER + /** * Adds the contents to field which will be * shown in the first line of searchUI. @@ -191,7 +191,7 @@ * @param aExcerpt Excerpt text to add to the document. */ IMPORT_C void AddHLDisplayFieldL(const TDesC& aField); -#endif + private: // Constructors diff -r 7cda54f2d97f -r e3c09e9691e0 searchsrv_plat/cpix_utility_api/inc/cpixmaindefs.h --- a/searchsrv_plat/cpix_utility_api/inc/cpixmaindefs.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchsrv_plat/cpix_utility_api/inc/cpixmaindefs.h Mon Sep 06 09:24:34 2010 +0530 @@ -254,7 +254,8 @@ // Default prefix analyzer #define CPIX_ANALYZER_DEFAULT_PREFIX L"natural(prefix)" -#define CPIX_ANALYZER_STANDARD L"standard" +#define CPIX_ANALYZER_STANDARD L"standard" +#define CPIX_ANALYZER_PHONENUMBER L"PhoneNumberAnalyzer" //#define CPIX_ANALYZER_DEFAULT L"standard" #define CPIX_TOKENIZER_STANDARD L"stdtokens" diff -r 7cda54f2d97f -r e3c09e9691e0 searchsrv_plat/cpix_utility_api/inc/cpixwatchdogcommon.h --- a/searchsrv_plat/cpix_utility_api/inc/cpixwatchdogcommon.h Tue Aug 31 17:30:16 2010 +0530 +++ b/searchsrv_plat/cpix_utility_api/inc/cpixwatchdogcommon.h Mon Sep 06 09:24:34 2010 +0530 @@ -19,7 +19,7 @@ #define CPIXWATCHDOGCOMMON_H_ //Length of uid string in cenrep -const TInt KCenrepUidLength = 20; +const TInt KCenrepUidLength = 256; //Uid of watchdog cetral repository database const TUid KWDrepoUidMenu = {0x20029ab8}; const TUint32 KHarvesterServerKey = 0x1;