666 MDBTransaction* dbTrans = iDbAccessor->PrepareTransactionL ( queryBuf ); |
666 MDBTransaction* dbTrans = iDbAccessor->PrepareTransactionL ( queryBuf ); |
667 CleanupStack::PopAndDestroy (); //queryBuf |
667 CleanupStack::PopAndDestroy (); //queryBuf |
668 CleanupStack::PushL ( TCleanupItem ( CUriListInterface::DestroyTransObj, dbTrans ) ); |
668 CleanupStack::PushL ( TCleanupItem ( CUriListInterface::DestroyTransObj, dbTrans ) ); |
669 TInt lt = aQueryArgs.Get ( TPolicyQueryArgs::ETldListType ); |
669 TInt lt = aQueryArgs.Get ( TPolicyQueryArgs::ETldListType ); |
670 RBuf8 upperCaseUri; |
670 RBuf8 upperCaseUri; |
671 upperCaseUri.Create(aUri); |
671 CleanupClosePushL(upperCaseUri); |
|
672 upperCaseUri.CreateL(aUri); |
672 upperCaseUri.UpperCase(); |
673 upperCaseUri.UpperCase(); |
673 dbTrans->BindTextL(0, aUri); |
674 dbTrans->BindTextL(0, aUri); |
674 dbTrans->BindIntL(1, lt); |
675 dbTrans->BindIntL(1, lt); |
675 dbTrans->BindTextL(2, upperCaseUri ); |
676 dbTrans->BindTextL(2, upperCaseUri ); |
676 |
677 |
677 // Execute the query |
678 // Execute the query |
678 CUriQueryFilter* queryFilter = CTldPolicyDataFilter::NewL ( dbTrans ); |
679 CUriQueryFilter* queryFilter = CTldPolicyDataFilter::NewL ( dbTrans ); |
679 upperCaseUri.Close(); |
680 CleanupStack::PopAndDestroy (); //upperCaseUri |
680 CleanupStack::Pop (); // dbTrans |
681 CleanupStack::Pop (); // dbTrans |
681 return queryFilter; // return the queryFilter |
682 return queryFilter; // return the queryFilter |
682 } |
683 } |
683 |
684 |
684 /** |
685 /** |
1242 RBuf8 tld; |
1243 RBuf8 tld; |
1243 RBuf8 customisedUri; |
1244 RBuf8 customisedUri; |
1244 HBufC8* tldPtr; |
1245 HBufC8* tldPtr; |
1245 User::LeaveIfError ( tldUri1.Parse ( aUri ) ); |
1246 User::LeaveIfError ( tldUri1.Parse ( aUri ) ); |
1246 TBool isSchemePresent = tldUri1.IsPresent( EUriScheme ); |
1247 TBool isSchemePresent = tldUri1.IsPresent( EUriScheme ); |
|
1248 CleanupClosePushL ( tld ); |
|
1249 CleanupClosePushL ( customisedUri ); |
1247 if (!isSchemePresent) |
1250 if (!isSchemePresent) |
1248 { |
1251 { |
1249 _LIT8(KHttp, "http://"); |
1252 _LIT8(KHttp, "http://"); |
1250 RBuf8 urirbuf; |
1253 RBuf8 urirbuf; |
1251 urirbuf.CleanupClosePushL(); |
1254 urirbuf.CleanupClosePushL(); |
1252 urirbuf.CreateL(KHttp,aUri.Length()+7); |
1255 urirbuf.CreateL(KHttp,aUri.Length()+7); |
1253 urirbuf.Append(aUri); |
1256 urirbuf.Append(aUri); |
1254 customisedUri.Create( DoNormalisationLC ( urirbuf ) ); |
1257 customisedUri.CreateL( DoNormalisationLC ( urirbuf ) ); |
1255 TUriParser8 tldUri2; |
1258 TUriParser8 tldUri2; |
1256 User::LeaveIfError ( tldUri2.Parse ( customisedUri ) ); |
1259 User::LeaveIfError ( tldUri2.Parse ( customisedUri ) ); |
1257 __ASSERT_ALWAYS(tldUri2.IsPresent( EUriHost ), User::Invariant()); |
1260 __ASSERT_ALWAYS(tldUri2.IsPresent( EUriHost ), User::Invariant()); |
1258 tld.Create( tldUri2.Extract(EUriHost) ); |
1261 tld.CreateL( tldUri2.Extract(EUriHost) ); |
1259 tldPtr = tld.AllocL(); |
1262 tldPtr = tld.AllocL(); |
1260 CleanupStack::PopAndDestroy(2); //calls aRBuf.Close()and DoNormalisationLC pop |
1263 CleanupStack::PopAndDestroy(2); //calls aRBuf.Close()and DoNormalisationLC pop |
1261 |
1264 |
1262 } |
1265 } |
1263 else |
1266 else |
1264 { |
1267 { |
1265 customisedUri.Create( DoNormalisationLC ( aUri ) ); |
1268 customisedUri.CreateL( DoNormalisationLC ( aUri ) ); |
1266 User::LeaveIfError ( tldUri1.Parse ( customisedUri ) ); |
1269 User::LeaveIfError ( tldUri1.Parse ( customisedUri ) ); |
1267 __ASSERT_ALWAYS(tldUri1.IsPresent( EUriHost ), User::Invariant()); |
1270 __ASSERT_ALWAYS(tldUri1.IsPresent( EUriHost ), User::Invariant()); |
1268 tld.Create( tldUri1.Extract(EUriHost) ); |
1271 tld.CreateL( tldUri1.Extract(EUriHost) ); |
1269 tldPtr = tld.AllocL(); |
1272 tldPtr = tld.AllocL(); |
1270 CleanupStack::PopAndDestroy ();//objects added in DoNormalisationLC |
1273 CleanupStack::PopAndDestroy ();//objects added in DoNormalisationLC |
1271 } |
1274 } |
1272 tld.Close(); |
1275 CleanupStack::PopAndDestroy (); //customisedUri |
1273 customisedUri.Close(); |
1276 CleanupStack::PopAndDestroy (); //tld |
1274 return tldPtr; |
1277 return tldPtr; |
1275 } |
1278 } |
1276 |
1279 |
1277 /** |
1280 /** |
1278 Does the syntax based normalisation. If the MUriCustomiser is set then it customises the URI, |
1281 Does the syntax based normalisation. If the MUriCustomiser is set then it customises the URI, |