--- 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();
}
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.0">
+ <package id="searchsrv" name="Search Services" levels="services engine generic api">
+ <collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
+ <component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_utility_api/cpix_utility_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_utility_api/group"/>
+ </component>
+ <component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_framework_api/cpix_framework_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_framework_api/group"/>
+ </component>
+ <component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_search_api/cpix_search_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_search_api/group"/>
+ </component>
+ </collection>
+ <collection id="searchengine" name="Search Engine" level="engine">
+ <component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/util/group"/>
+ </component>
+ <component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/oss/group"/>
+ </component>
+ <component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/cpix/group"/>
+ </component>
+ </collection>
+ <collection id="searcher" name="Searcher" level="generic">
+ <component id="searchclient" name="Search Client" filter="s60" introduced="^4">
+ <unit bldFile="searcher/SearchClient/group"/>
+ </component>
+ <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
+ <unit bldFile="searcher/SearchServer/group"/>
+ </component>
+ <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+ <unit bldFile="searcher/tsrc/group"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
+ <component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
+ <unit bldFile="harvester/pluginfw/group"/>
+ </component>
+ <component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
+ <unit bldFile="harvester/harvesterserver" qt:proFile="harvester.pro"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
+ <component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+ <unit bldFile="WatchDog/group"/>
+ </component>
+ </collection>
+ <collection id="qcpix" name="Qt CPIX" level="engine">
+ <component id="qcpix_build" name="Qt CPIX Build" introduced="^4" filter="s60">
+ <unit bldFile="qcpix" qt:proFile="cpix.pro"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_info" name="Search Services Info">
+ <component id="searchsrv_rom" name="Search Services ROM" introduced="^4" filter="s60" class="config">
+ <unit bldFile="rom"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_test" name="Search Services Test">
+ <component id="cpixmwtester" name="CPIX Middleware Tester" purpose="development" filter="s60,test" introduced="^4">
+ <unit bldFile="tsrc/CPixMWTester/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /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 @@
+<PackageMap root="sf" layer="mw"/>
--- 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
--- /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 <platform_paths.hrh>
+
+
+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
--- 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_;
};
--- 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;
--- 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_ );
}
--- 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<analysis::KoreanQueryTokenizer>::create},
{CPIX_ANALYZER_STANDARD, AnalyzerWrapCtor<lucene::analysis::standard::StandardAnalyzer>::create},
+ {CPIX_ANALYZER_PHONENUMBER, AnalyzerWrapCtor<lucene::analysis::PhoneNumberAnalyzer>::create},
{CPIX_ANALYZER_DEFAULT, TokenStreamFactoryCtor<DefaultTokenStreamFactory>::create},
// TODO: Add more Tokenizers/Analyzers
--- 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_;
}
--- 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
+
--- 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);
--- 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);
}
--- 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<CServer2*>( Server() );
+ static_cast<CSearchServer*>( server )->ContinueHouseKeeping();
+ }
+
+// -----------------------------------------------------------------------------
// CSearchServerSession::ForceHouseKeeping()
// Force housekeeping
// -----------------------------------------------------------------------------
--- /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
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition xmlns:sf="http://www.symbian.org/system-definition" schema="3.0.0" id-namespace="http://www.nokia.com/schema/drd/system-definition">
+ <package id="sf:searchsrv" name="Search Services" levels="services engine generic api">
+ <collection id="sf:searcher" name="Searcher" level="generic">
+ <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+ <unit bldFile="../../searcher/tsrc/SymbianOsUnit/group/s60_3rd"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- 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
};
/**
--- 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
--- 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"
--- 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;