contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp
--- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp Mon Mar 15 12:41:53 2010 +0200
+++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp Wed Mar 31 22:04:35 2010 +0300
@@ -20,7 +20,6 @@
#include <liwgenericparam.h>
#include <escapeutils.h>
#include <badesca.h>
-#include <aiwvarianttype.hrh>
#include "cpliwmap.h"
#include "cpdebug.h"
@@ -29,6 +28,8 @@
#include "cpublisherregistrymap.h"
#include "cpsecuritypolicy.h"
+using namespace LIW;
+
// ======== MEMBER FUNCTIONS ========
// ---------------------------------------------------------------------------
@@ -56,34 +57,16 @@
CCPLiwMap* map( NULL );
if( param && pos !=KErrNotFound )
{
- RBuf typeBuf;
- typeBuf.CleanupClosePushL();
- TPtrC type( KNullDesC );
- if( !param->Value().Get( type ) )
+ if( IsTypePublisherL(param->Value()) )
{
- TPtrC8 type8( KNullDesC8 );
- if( !param->Value().Get( type8 ) )
- {
- User::Leave( KErrBadName );
- }
- typeBuf.Assign( EscapeUtils::ConvertToUnicodeFromUtf8L( type8 ) );
+ map = CPublisherRegistryMap::NewLC();
}
- else
- {
- typeBuf.CreateL( type );
- }
- if( typeBuf.Find( KCpData () ) != KErrNotFound )
+ else
{
map = CContentMap::NewLC();
}
- else if ( typeBuf.Find( KPublisher () ) != KErrNotFound )
- {
- map = CPublisherRegistryMap::NewLC();
- }
- else User::Leave( KErrArgument );
- map->SetL( aList );
- CleanupStack::Pop( map );
- CleanupStack::PopAndDestroy( &typeBuf );
+ map->SetL(aList);
+ CleanupStack::Pop(map);
}
else
{
@@ -95,6 +78,38 @@
// ---------------------------------------------------------------------------
//
// ---------------------------------------------------------------------------
+//
+EXPORT_C CCPLiwMap* CCPLiwMap::NewL( const CLiwMap& aMap )
+ {
+ CP_DEBUG( _L8("CCPLiwMap::NewL") );
+ TLiwVariant typeVariant;
+ typeVariant.PushL();
+ CCPLiwMap* map( NULL );
+
+ if (aMap.FindL(KType, typeVariant))
+ {
+ if( IsTypePublisherL(typeVariant) )
+ {
+ map = CPublisherRegistryMap::NewLC();
+ }
+ else
+ {
+ map = CContentMap::NewLC();
+ }
+ map->SetL(aMap);
+ CleanupStack::Pop(map);
+ }
+ else
+ {
+ User::Leave( KErrPathNotFound );
+ }
+ CleanupStack::PopAndDestroy(&typeVariant);
+ return map;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
//
EXPORT_C HBufC8* CCPLiwMap::PackForServerLC() const
{
@@ -282,6 +297,61 @@
return result;
}
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CLiwDefaultList* CCPLiwMap::GetActionTriggersLC( ) const
+ {
+ CP_DEBUG( _L8("CCPLiwMap::GetActionTriggers") );
+ TInt pos( 0 );
+ CLiwDefaultList* list(NULL);
+ const TLiwGenericParam* paramForValue = iMap->FindFirst( pos,
+ KActionTrigger );
+ if ( paramForValue )
+ {
+ if ( paramForValue->Value().TypeId() == EVariantTypeDesC8 )
+ {
+ list = CLiwDefaultList::NewLC();
+ list->AppendL(paramForValue->Value());
+ }
+ if ( paramForValue->Value().TypeId() == EVariantTypeDesC )
+ {
+ list = CLiwDefaultList::NewLC();
+ RBuf8 desc8;
+ desc8.CleanupClosePushL();
+ desc8.Assign( EscapeUtils::ConvertFromUnicodeToUtf8L(
+ paramForValue->Value().AsDes() ) );
+ list->AppendL(TLiwVariant(desc8));
+ CleanupStack::PopAndDestroy( &desc8 );
+ }
+ else if ( paramForValue->Value().TypeId() == EVariantTypeList )
+ {
+ list = CLiwDefaultList::NewLC();
+ const CLiwList* sourceList = paramForValue->Value().AsList();
+ TInt count = sourceList->Count();
+ for (TInt i = 0; i < count; i++)
+ {
+ TLiwVariant trigger;
+ sourceList->AtL(i,trigger);
+ if (trigger.TypeId() == EVariantTypeDesC8)
+ {
+ list->AppendL(trigger);
+ }
+ else if (trigger.TypeId() == EVariantTypeDesC)
+ {
+ RBuf8 desc8;
+ desc8.CleanupClosePushL();
+ desc8.Assign( EscapeUtils::ConvertFromUnicodeToUtf8L(
+ trigger.AsDes() ) );
+ list->AppendL(TLiwVariant(desc8));
+ CleanupStack::PopAndDestroy( &desc8 );
+ }
+ }
+ }
+ }
+ return list;
+ }
// ---------------------------------------------------------------------------
//
@@ -445,49 +515,78 @@
//
void CCPLiwMap::SetL( const CLiwGenericParamList& aInParamList )
{
-
CP_DEBUG( _L8("CCPLiwMap::SetL") );
for ( TInt i = 0; i < aInParamList.Count( ); i++ )
{
const TLiwGenericParam& param = aInParamList[i];
- if ( param.Value().TypeId( ) == LIW::EVariantTypeMap )
+ ExtractParamL(param);
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CCPLiwMap::SetL( const CLiwMap& aMap )
+ {
+ CP_DEBUG( _L8("CCPLiwMap::SetL") );
+ for ( TInt i = 0; i < aMap.Count( ); i++ )
+ {
+ TBuf8<128> key;
+ aMap.AtL(i, key);
+ TLiwVariant value;
+ value.PushL();
+ aMap.FindL(key, value);
+ TLiwGenericParam param(key,value);
+ ExtractParamL(param);
+ CleanupStack::PopAndDestroy(&value);
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CCPLiwMap::ExtractParamL(const TLiwGenericParam& aParam)
+ {
+ CP_DEBUG( _L8("CCPLiwMap::ExtractVariantL") );
+ if (aParam.Value().TypeId() == LIW::EVariantTypeMap)
+ {
+ const CLiwMap* map = aParam.Value().AsMap();
+ for (TInt i = 0; i < map->Count(); i++)
{
- const CLiwMap* map = param.Value().AsMap( );
- for ( TInt i = 0; i <map->Count( ); i++ )
+ TBuf8<128> key;
+ map->AtL(i, key);
+ TLiwVariant value;
+ value.PushL();
+ map->FindL(key, value);
+ if (key == KOperation)
{
- TBuf8<128> key;
- map->AtL( i, key );
- TLiwVariant value;
- value.PushL( );
- map->FindL( key, value );
- if ( key == KOperation )
- {
- IsProperOperationL( value );
- }
- RBuf8 datadesc;
- datadesc.CleanupClosePushL();
- if ( value.TypeId( ) == LIW::EVariantTypeMap )
- {
- const CLiwMap* internalMap = value.AsMap( );
- datadesc.CreateL( internalMap->Size( ) );
- RDesWriteStream datastrm(datadesc);
- CleanupClosePushL( datastrm );
- internalMap->ExternalizeL( datastrm );
- datastrm.CommitL( );
- CleanupStack::PopAndDestroy( &datastrm );
- value.Reset( );
- value.Set( datadesc );
- }
- TLiwGenericParam data( key, value);
- iMap->AppendL( data );
- CleanupStack::PopAndDestroy( &datadesc );
- CleanupStack::PopAndDestroy( &value );
+ IsProperOperationL(value);
}
+ RBuf8 datadesc;
+ datadesc.CleanupClosePushL();
+ if (value.TypeId() == LIW::EVariantTypeMap)
+ {
+ const CLiwMap* internalMap = value.AsMap();
+ datadesc.CreateL(internalMap->Size());
+ RDesWriteStream datastrm(datadesc);
+ CleanupClosePushL(datastrm);
+ internalMap->ExternalizeL(datastrm);
+ datastrm.CommitL();
+ CleanupStack::PopAndDestroy(&datastrm);
+ value.Reset();
+ value.Set(datadesc);
+ }
+ TLiwGenericParam data(key, value);
+ iMap->AppendL(data);
+ CleanupStack::PopAndDestroy(&datadesc);
+ CleanupStack::PopAndDestroy(&value);
}
- else
- {
- iMap->AppendL( param );
- }
+ }
+ else
+ {
+ iMap->AppendL(aParam);
}
}
@@ -765,11 +864,21 @@
//
TBool CCPLiwMap::IsTriggerL( ) const
{
- TBool result( EFalse );
- RBuf8 buffer;
- buffer.CleanupClosePushL();
- result = GetPropertyL( KActionTrigger, buffer );
- CleanupStack::PopAndDestroy( &buffer );
+ TBool result(EFalse);
+ TInt pos( 0 );
+ const TLiwGenericParam* paramForValue = iMap->FindFirst( pos,
+ KActionTrigger );
+ if ( pos != KErrNotFound )
+ {
+ result = ETrue;
+ LIW::TVariantTypeId variantType = paramForValue->Value().TypeId();
+ if ( variantType != EVariantTypeDesC &&
+ variantType != EVariantTypeDesC8 &&
+ variantType != EVariantTypeList )
+ {
+ User::Leave( KErrBadName );
+ }
+ }
return result;
}
@@ -1177,6 +1286,46 @@
//
// ---------------------------------------------------------------------------
//
+TBool CCPLiwMap::IsTypePublisherL( const TLiwVariant& aVariant )
+ {
+ TBool result (EFalse);
+ RBuf typeBuf;
+ typeBuf.CleanupClosePushL();
+ TPtrC type( KNullDesC );
+ if( !aVariant.Get( type ) )
+ {
+ TPtrC8 type8( KNullDesC8 );
+ if( !aVariant.Get( type8 ) )
+ {
+ User::Leave( KErrBadName );
+ }
+ typeBuf.Assign( EscapeUtils::ConvertToUnicodeFromUtf8L( type8 ) );
+ }
+ else
+ {
+ typeBuf.CreateL( type );
+ }
+ if( typeBuf.Find( KCpData () ) != KErrNotFound )
+ {
+ result = EFalse;
+ }
+ else if ( typeBuf.Find( KPublisher () ) != KErrNotFound )
+ {
+ result = ETrue;
+ }
+ else
+ {
+ User::Leave( KErrArgument );
+ }
+ CleanupStack::PopAndDestroy( &typeBuf );
+ return result;
+ }
+
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
void CCPLiwMap::CheckIdentifiersL() const
{
IsPublisherNameL();
@@ -1253,7 +1402,7 @@
if ( pos != KErrNotFound )
{
found = ETrue;
- TInt length;
+ TInt length(0);
if( paramForValue->Value().TypeId() == EVariantTypeDesC )
{
length = paramForValue->Value().AsDes().Length();