add whether we're in which eventloop / a worker thread to the log output.

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

diff --git a/citadel/modules/rssclient/rss_atom_parser.c b/citadel/modules/rssclient/rss_atom_parser.c
index c45e9358d7f81510ce39a5ecad4b88760363f418..cd4121d5d1172bb52392e553fc49a2feb720e726 100644 (file)
--- a/citadel/modules/rssclient/rss_atom_parser.c
+++ b/citadel/modules/rssclient/rss_atom_parser.c
@@ -62,27 +62,27 @@ void rss_remember_item(rss_item *ri, rss_aggregator *Cfg);
 
 int RSSAtomParserDebugEnabled = 0;
 
-#define N ((rss_aggregator*)IO->Data)->QRnumber
+#define N ((rss_aggregator*)IO->Data)->Cfg.QRnumber
 
 #define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSAtomParserDebugEnabled != 0))
 
 #define EVRSSATOM_syslog(LEVEL, FORMAT, ...)                           \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]RSSP" FORMAT,           \
-                            IO->ID, CCID, N, __VA_ARGS__)
+                            "%s[%ld]CC[%d][%ld]RSSP" FORMAT,           \
+                            IOSTR, IO->ID, CCID, N, __VA_ARGS__)
 
 #define EVRSSATOMM_syslog(LEVEL, FORMAT)                               \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]RSSP" FORMAT,           \
-                            IO->ID, CCID, N)
+                            "%s[%ld]CC[%d][%ld]RSSP" FORMAT,           \
+                            IOSTR, IO->ID, CCID, N)
 
 #define EVRSSATOMCS_syslog(LEVEL, FORMAT, ...)                 \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSSP" FORMAT,  \
-                            IO->ID, N, __VA_ARGS__)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSSP" FORMAT,  \
+                            IOSTR, IO->ID, N, __VA_ARGS__)
 
 #define EVRSSATOMSM_syslog(LEVEL, FORMAT)                      \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSSP" FORMAT,  \
-                            IO->ID, N)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSSP" FORMAT,  \
+                            IOSTR, IO->ID, N)
 
 /*
  * Convert an RDF/RSS datestamp into a time_t
@@ -602,7 +602,7 @@ void FreeNetworkSaveMessage (void *vMsg)
 {
        networker_save_message *Msg = (networker_save_message *) vMsg;
 
-       CtdlFreeMessageContents(&Msg->Msg);
+       CM_FreeContents(&Msg->Msg);
        FreeStrBuf(&Msg->Message);
        FreeStrBuf(&Msg->MsgGUID);
 
@@ -675,7 +675,7 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
        /* gather the cheaply computed information now... */
 
        if (ri->guid != NULL) {
-               SaveMsg->Msg.cm_fields['E'] = strdup(ChrPtr(ri->guid));
+               CM_SetField(&SaveMsg->Msg, eExclusiveID, SKEY(ri->guid));
        }
 
        SaveMsg->MsgGUID = guid;
@@ -683,12 +683,10 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
        if (ri->pubdate <= 0) {
                ri->pubdate = time(NULL); /// TODO: use event time!
        }
-       SaveMsg->Msg.cm_fields['T'] = malloc(64);
-       snprintf(SaveMsg->Msg.cm_fields['T'], 64, "%ld", ri->pubdate);
+       CM_SetFieldLONG(&SaveMsg->Msg, eTimestamp, ri->pubdate);
        if (ri->channel_title != NULL) {
                if (StrLength(ri->channel_title) > 0) {
-                       SaveMsg->Msg.cm_fields['O'] =
-                               strdup(ChrPtr(ri->channel_title));
+                       CM_SetField(&SaveMsg->Msg, eOriginalRoom, SKEY(ri->channel_title));
                }
        }