From 2e82ffdd5614745a54c729a48bc640c2aaee6405 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 21 Mar 2013 01:25:08 +0100
Subject: [PATCH] RSSClient: fix loading of RSS Configs; Usetable handling

  - Configs: forgot to iterate over the list
  - Configs: extract the bare URL
  - UseTable: now and then we need to parse the document, so we refresh the seen-table timestamps; else these entries will be removed by the TDAB.
---
 citadel/modules/rssclient/serv_rssclient.c | 39 ++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index c2d95d34a..1e43e96c7 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -164,7 +164,9 @@ void DeleteRssCfg(void *vptr)
 {
 	rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
 	AsyncIO *IO = &RSSAggr->IO;
-	EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
+
+	if (IO->CitContext != NULL)
+		EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
 
 	FreeStrBuf(&RSSAggr->Url);
 	FreeStrBuf(&RSSAggr->rooms);
@@ -483,19 +485,28 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 	if (StrLength(guid) > 40)
 		StrBufCutAt(guid, 40, NULL);
 	/* Find out if we've already seen this item */
-	memcpy(ut.ut_msgid, SKEY(guid));
-	ut.ut_timestamp = time(NULL);
 
-	cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
 #ifndef DEBUG_RSS
+	cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
 	if (cdbut != NULL) {
-		/* Item has already been seen */
-		EVRSSC_syslog(LOG_DEBUG,
-			      "%s has already been seen\n",
-			      ChrPtr(Ctx->Url));
+                memcpy(&ut, cdbut->ptr,
+                       ((cdbut->len > sizeof(struct UseTable)) ?
+                        sizeof(struct UseTable) : cdbut->len));
+
+		if (IO->Now - ut.ut_timestamp  > 
+		    60 * 60 * 24 * 4)
+		{
+			/* Item has already been seen in the last 4 days */
+			EVRSSC_syslog(LOG_DEBUG,
+				      "%s has already been seen\n",
+				      ChrPtr(Ctx->Url));
+		}
 		cdb_free(cdbut);
 	}
 
+	memcpy(ut.ut_msgid, SKEY(guid));
+	ut.ut_timestamp = IO->Now;
+
 	/* rewrite the record anyway, to update the timestamp */
 	cdb_store(CDB_USETABLE,
 		  SKEY(guid),
@@ -578,10 +589,12 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 
 	if (server_shutting_down) return;
 
-	pLine = OneRNCFG->NetConfigs[pop3client];
+	pLine = OneRNCFG->NetConfigs[rssclient];
 
 	while (pLine != NULL)
 	{
+		const char *lPtr = NULL;
+
 		if (Count == NULL)
 		{
 			Count = malloc(
@@ -595,7 +608,11 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 		memset (RSSAggr, 0, sizeof(rss_aggregator));
 		RSSAggr->QRnumber = qrbuf->QRnumber;
 		RSSAggr->roomlist_parts = 1;
-		RSSAggr->Url = NewStrBufDup(pLine->Value[1]);
+		RSSAggr->Url = NewStrBufPlain(NULL, StrLength(pLine->Value[0]));
+		StrBufExtract_NextToken(RSSAggr->Url,
+					pLine->Value[0],
+					&lPtr,
+					'|');
 
 		pthread_mutex_lock(&RSSQueueMutex);
 		GetHash(RSSFetchUrls,
@@ -628,6 +645,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 			FreeStrBuf(&RSSAggr->Url);
 			free(RSSAggr);
 			RSSAggr = NULL;
+			pLine = pLine->next;
 			continue;
 		}
 		pthread_mutex_unlock(&RSSQueueMutex);
@@ -645,6 +663,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 		    DeleteRssCfg);
 
 		pthread_mutex_unlock(&RSSQueueMutex);
+		pLine = pLine->next;
 	}
 }
 
-- 
2.30.2