* svn propset svn_keywords 'Id' on some files that didn't have it

[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 141ff69ed7faf336ec5a1610e0386e0f7f807989..7902ab7434fbbb07c2f3809db883319ac0ccdc21 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,5 +1,5 @@
 /*
- * $Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $
+ * $Id$
  *
  * Bring external RSS feeds into rooms.
  *
@@ -62,6 +62,7 @@ struct rss_item {
        time_t pubdate;
        char channel_title[256];
        int item_tag_nesting;
+       char *author_or_creator;
 };
 
 struct rssnetcfg *rnclist = NULL;
@@ -139,15 +140,27 @@ void rss_save_item(struct rss_item *ri) {
                msg->cm_magic = CTDLMESSAGE_MAGIC;
                msg->cm_anon_type = MES_NORMAL;
                msg->cm_format_type = FMT_RFC822;
-               msg->cm_fields['A'] = strdup("rss");
+
+               if (ri->author_or_creator != NULL) {
+                       msg->cm_fields['A'] = html_to_ascii(ri->author_or_creator,
+                               strlen(ri->author_or_creator), 512, 0);
+                       striplt(msg->cm_fields['A']);
+               }
+               else {
+                       msg->cm_fields['A'] = strdup("rss");
+               }
+
                msg->cm_fields['N'] = strdup(NODENAME);
-               msg->cm_fields['U'] = html_to_ascii(ri->title, 
-                                                   strlen(ri->title), 
-                                                   512, 0);
+               if (ri->title != NULL) {
+                       msg->cm_fields['U'] = html_to_ascii(ri->title, strlen(ri->title), 512, 0);
+                       striplt(msg->cm_fields['U']);
+               }
                msg->cm_fields['T'] = malloc(64);
                snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
-               if (!IsEmptyStr(ri->channel_title)) {
-                       msg->cm_fields['O'] = strdup(ri->channel_title);
+               if (ri->channel_title != NULL) {
+                       if (!IsEmptyStr(ri->channel_title)) {
+                               msg->cm_fields['O'] = strdup(ri->channel_title);
+                       }
                }
 
                msglen = 1024 + strlen(ri->link) + strlen(ri->description) ;
@@ -234,6 +247,8 @@ void rss_xml_start(void *data, const char *supplied_el, const char **attr) {
                ri->title = NULL;
                if (ri->link != NULL) free(ri->link);
                ri->link = NULL;
+               if (ri->author_or_creator != NULL) free(ri->author_or_creator);
+               ri->author_or_creator = NULL;
                if (ri->description != NULL) free(ri->description);
                ri->description = NULL;
 
@@ -293,6 +308,12 @@ void rss_xml_end(void *data, const char *supplied_el) {
                ri->pubdate = rdf_parsedate(ri->chardata);
        }
 
+       if ( ((!strcasecmp(el, "author")) || (!strcasecmp(el, "creator"))) && (ri->chardata != NULL) ) {
+               if (ri->author_or_creator != NULL) free(ri->author_or_creator);
+               striplt(ri->chardata);
+               ri->author_or_creator = strdup(ri->chardata);
+       }
+
        if (!strcasecmp(el, "item")) {
                --ri->item_tag_nesting;
                rss_save_item(ri);
@@ -379,6 +400,7 @@ void rss_do_fetching(char *url, char *rooms) {
        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
        curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+       curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);           /* die after 180 seconds */
        if (!IsEmptyStr(config.c_ip_addr)) {
                curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
        }
@@ -421,6 +443,8 @@ shutdown:
        ri.title = NULL;
        if (ri.link != NULL) free(ri.link);
        ri.link = NULL;
+       if (ri.author_or_creator != NULL) free(ri.author_or_creator);
+       ri.author_or_creator = NULL;
        if (ri.description != NULL) free(ri.description);
        ri.description = NULL;
        if (ri.chardata_len > 0) {
@@ -521,7 +545,7 @@ void *rssclient_scan(void *args) {
        struct CitContext rssclientCC;
 
        /* Give this thread its own private CitContext */
-       CtdlFillPrivateContext(&rssclientCC, "rssclient");
+       CtdlFillSystemContext(&rssclientCC, "rssclient");
        citthread_setspecific(MyConKey, (void *)&rssclientCC );
 
        CtdlThreadAllocTSD();
@@ -565,5 +589,5 @@ CTDL_MODULE_INIT(rssclient)
                CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, 0);
        }
        /* return our Subversion id for the Log */
-        return "$Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $";
+        return "$Id$";
 }