fix more merge hickups

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 7b49ec5a6e5823f2f0de70a6dee697400d45c2d4..9973a1e3404dc493931790aa5e78d124a3599908 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -137,10 +137,12 @@ void UnlinkRooms(rss_aggregator *Cfg)
                        long *lData = (long*) vData;
                        DeleteRoomReference(*lData);
                }
+/*
+               if (server_shutting_down)
+                       break; /* TODO */
 
                DeleteHashPos(&At);
        }
-
 }
 
 void UnlinkRSSAggregator(rss_aggregator *Cfg)
@@ -339,6 +341,10 @@ void rss_save_item(rss_item *ri, rss_aggregator *Cfg)
                                StrBufRFC2047encode(&Encoded, ri->author_or_creator);
                                msg->cm_fields['A'] = SmashStrBuf(&Encoded);
                                msg->cm_fields['P'] = strdup("rss@localhost");
+
+                       }
+                       if (ri->pubdate <= 0) {
+                               ri->pubdate = time(NULL);
                        }
                }
        }
@@ -451,7 +457,6 @@ int rss_do_fetching(rss_aggregator *Cfg)
 }
 
 
-
 void DeleteRssCfg(void *vptr)
 {
        rss_aggregator *rncptr = (rss_aggregator *)vptr;
@@ -485,11 +490,12 @@ void DeleteRssCfg(void *vptr)
 eNextState RSSAggregatorTerminate(AsyncIO *IO)
 {
        rss_aggregator *rncptr = (rss_aggregator *)IO->Data;
-       HashPos *At;
-       long HKLen;
-       const char *HK;
-       void *vData;
-
+       /*
+         HashPos *At;
+         long HKLen;
+         const char *HK;
+         void *vData;
+       */
        pthread_mutex_lock(&RSSQueueMutex);
        rncptr->RefCount --;
        if (rncptr->RefCount == 0)
@@ -517,7 +523,7 @@ eNextState RSSAggregatorTerminate(AsyncIO *IO)
  */
 void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 {
-       StrBuf *CfgData;
+       StrBuf *CfgData=NULL;
        StrBuf *CfgType;
        StrBuf *Line;
        rss_room_counter *Count = NULL;
@@ -545,7 +551,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 
        assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
 
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
                
        /* Only do net processing for rooms that have netconfigs */
@@ -554,16 +560,21 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                //syslog(LOG_DEBUG, "rssclient: %s no config.\n", qrbuf->QRname);
                return;
        }
-       if (CtdlThreadCheckStop())
+
+       if (server_shutting_down)
                return;
+
        if (fstat(fd, &statbuf) == -1) {
                syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
-                       filename, strerror(errno));
+                      filename, strerror(errno));
                return;
        }
-       if (CtdlThreadCheckStop())
+
+       if (server_shutting_down)
                return;
+
        CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+
        if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
                close(fd);
                FreeStrBuf(&CfgData);
@@ -572,7 +583,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
                return;
        }
        close(fd);
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
                return;
        
        CfgPtr = NULL;
@@ -686,7 +697,8 @@ void rssclient_scan(void) {
        pthread_mutex_lock(&RSSQueueMutex);
 
        it = GetNewHashPos(RSSFetchUrls, 0);
-       while (GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
+       while (!server_shutting_down &&
+              GetNextHashPos(RSSFetchUrls, it, &len, &Key, &vrptr) && 
               (vrptr != NULL)) {
                rptr = (rss_aggregator *)vrptr;
                if (rptr->RefCount == 0)