--- a/engine/src/FeedEngine.cpp	Tue Jul 06 03:44:46 2010 +0530
+++ b/engine/src/FeedEngine.cpp	Wed Jul 07 14:19:21 2010 +0100
@@ -136,7 +136,6 @@
 	
 		if (interval != 0)
 			{
-			DP1("Running feed timer with interval %d", interval);
 			iFeedTimer.SetPeriod(interval);
 			iFeedTimer.RunPeriodically();
 			}
@@ -358,7 +357,7 @@
 
 void CFeedEngine::DBAddFeedL(const CFeedInfo& aItem)
 	{
-	DP2("CFeedEngine::DBAddFeed, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
+	DP2("CFeedEngine::DBAddFeed BEGIN, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
 	
 	CFeedInfo *info;
 	
@@ -379,8 +378,7 @@
 	descPtr.Copy(aItem.Description());
 	PodcastUtils::SQLEncode(descPtr);
 	
-	_LIT(KSqlStatement, "insert into feeds (url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle, lasterror)"
-			" values (\"%S\",\"%S\", \"%S\", \"%S\", \"%S\", \"%S\", \"%Ld\", \"%Ld\", \"%u\", \"%u\", \"%u\", \"%d\")");
+	_LIT(KSqlStatement, "insert into feeds (url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle, lasterror) values (\"%S\",\"%S\", \"%S\", \"%S\", \"%S\", \"%S\", \"%Ld\", \"%Ld\", \"%u\", \"%u\", \"%u\", \"%d\")");
 	iSqlBuffer.Format(KSqlStatement,
 			&aItem.Url(), titleBuf, descBuf, &aItem.ImageUrl(), &aItem.ImageFileName(), &aItem.Link(),
 			aItem.BuildDate().Int64(), aItem.LastUpdated().Int64(), aItem.Uid(), EAudioPodcast, aItem.CustomTitle(), aItem.LastError());
@@ -407,6 +405,7 @@
 		{
 		User::Leave(KErrCorrupt);
 		}
+	DP("CFeedEngine::DBAddFeed END");
 	}
 
 EXPORT_C void CFeedEngine::RemoveFeedL(TUint aUid) 
@@ -452,7 +451,7 @@
 
 void CFeedEngine::DBRemoveFeedL(TUint aUid)
 	{
-	DP("CFeedEngine::DBRemoveFeed");
+	DP("CFeedEngine::DBRemoveFeed BEGIN");
 	_LIT(KSqlStatement, "delete from feeds where uid=%u");
 	iSqlBuffer.Format(KSqlStatement, aUid);
 
@@ -476,11 +475,12 @@
 		{
 		User::Leave(KErrCorrupt);
 		}
+	DP("CFeedEngine::DBRemoveFeed END");
 	}
 
 void CFeedEngine::DBUpdateFeedL(const CFeedInfo &aItem)
 	{
-	DP2("CFeedEngine::DBUpdateFeed, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
+	DP2("CFeedEngine::DBUpdateFeed BEGIN, title=%S, URL=%S", &aItem.Title(), &aItem.Url());
 	
 	HBufC* titleBuf = HBufC::NewLC(KMaxLineLength);
 	TPtr titlePtr(titleBuf->Des());
@@ -492,8 +492,7 @@
 	descPtr.Copy(aItem.Description());
 	PodcastUtils::SQLEncode(descPtr);
 	
-	_LIT(KSqlStatement, "update feeds set url=\"%S\", title=\"%S\", description=\"%S\", imageurl=\"%S\", imagefile=\"%S\"," \
-			"link=\"%S\", built=\"%Lu\", lastupdated=\"%Lu\", feedtype=\"%u\", customtitle=\"%u\", lasterror=\"%d\" where uid=\"%u\"");
+	_LIT(KSqlStatement, "update feeds set url=\"%S\", title=\"%S\", description=\"%S\", imageurl=\"%S\", imagefile=\"%S\", link=\"%S\", built=\"%Lu\", lastupdated=\"%Lu\", feedtype=\"%u\", customtitle=\"%u\", lasterror=\"%d\" where uid=\"%u\"");
 	iSqlBuffer.Format(KSqlStatement,
 			&aItem.Url(), titleBuf, descBuf, &aItem.ImageUrl(), &aItem.ImageFileName(), &aItem.Link(),
 			aItem.BuildDate().Int64(), aItem.LastUpdated().Int64(), EAudioPodcast, aItem.CustomTitle(), aItem.LastError(), aItem.Uid());
@@ -520,6 +519,7 @@
 		{
 		User::Leave(KErrCorrupt);
 		}
+	DP("CFeedEngine::DBUpdateFeed END");
 	}
 
 void CFeedEngine::ParsingCompleteL(CFeedInfo *item)
@@ -1001,7 +1001,7 @@
 
 CFeedInfo* CFeedEngine::DBGetFeedInfoByUidL(TUint aFeedUid)
 	{
-	DP("CFeedEngine::DBGetFeedInfoByUid");
+	DP("CFeedEngine::DBGetFeedInfoByUid BEGIN");
 	CFeedInfo *feedInfo = NULL;
 	_LIT(KSqlStatement, "select url, title, description, imageurl, imagefile, link, built, lastupdated, uid, feedtype, customtitle, lasterror from feeds where uid=%u");
 	iSqlBuffer.Format(KSqlStatement, aFeedUid);
@@ -1070,7 +1070,7 @@
 		{
 		User::Leave(KErrNotFound);
 		}
-	
+	DP("CFeedEngine::DBGetFeedInfoByUid END");
 	return feedInfo;
 }