#define EVRSSC_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]RSS" FORMAT, \
- IO->ID, CCID, N, __VA_ARGS__)
+ "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
+ IOSTR, IO->ID, CCID, N, __VA_ARGS__)
#define EVRSSCM_syslog(LEVEL, FORMAT) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]RSS" FORMAT, \
- IO->ID, CCID, N)
+ "%s[%ld]CC[%d][%ld]RSS" FORMAT, \
+ IOSTR, IO->ID, CCID, N)
#define EVRSSQ_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT, \
DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
#define EVRSSCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT, \
- IO->ID, N)
+ DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSS" FORMAT, \
+ IOSTR, IO->ID, N)
typedef enum _RSSState {
eRSSCreated,
return 0;
}
+ CM_Flush(&SaveMsg->Msg);
+
if (SaveMsg->author_or_creator != NULL) {
char *From;
if (!FromAt && StrLength (SaveMsg->author_email) > 0)
{
StrBufRFC2047encode(&Encoded, SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['A'] = SmashStrBuf(&Encoded);
- SaveMsg->Msg.cm_fields['P'] =
- SmashStrBuf(&SaveMsg->author_email);
+ CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+ CM_SetAsFieldSB(&SaveMsg->Msg, eMessagePath, &SaveMsg->author_email);
}
else
{
if (FromAt)
{
- SaveMsg->Msg.cm_fields['A'] =
- SmashStrBuf(&SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['P'] =
- strdup(SaveMsg->Msg.cm_fields['A']);
+ CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &SaveMsg->author_or_creator);
+ CM_CopyField(&SaveMsg->Msg, eMessagePath, eAuthor);
}
else
{
StrBufRFC2047encode(&Encoded,
SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['A'] =
- SmashStrBuf(&Encoded);
- SaveMsg->Msg.cm_fields['P'] =
- strdup("rss@localhost");
+ CM_SetAsFieldSB(&SaveMsg->Msg, eAuthor, &Encoded);
+ CM_SetField(&SaveMsg->Msg, eMessagePath, HKEY("rss@localhost"));
}
}
}
else {
- SaveMsg->Msg.cm_fields['A'] = strdup("rss");
+ CM_SetField(&SaveMsg->Msg, eAuthor, HKEY("rss"));
}
- SaveMsg->Msg.cm_fields['N'] = strdup(NODENAME);
+ CM_SetField(&SaveMsg->Msg, eNodeName, CFG_KEY(c_nodename));
if (SaveMsg->title != NULL) {
long len;
char *Sbj;
StrBufTrim(Encoded);
StrBufRFC2047encode(&QPEncoded, Encoded);
- SaveMsg->Msg.cm_fields['U'] = SmashStrBuf(&QPEncoded);
+ CM_SetAsFieldSB(&SaveMsg->Msg, eMsgSubject, &QPEncoded);
FreeStrBuf(&Encoded);
}
if (SaveMsg->link == NULL)
if (rss_format_item(IO, RSSAggr->ThisMsg))
{
- RSSAggr->ThisMsg->Msg.cm_fields['M'] =
- SmashStrBuf(&RSSAggr->ThisMsg->Message);
+ CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText,
+ &RSSAggr->ThisMsg->Message);
CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
{
+ static const time_t antiExpire = USETABLE_ANTIEXPIRE_HIRES;
+ time_t seenstamp = 0;
#ifndef DEBUG_RSS
const char *Key;
long len;
/* Find out if we've already seen this item */
// todo: expiry?
SetRSSState(IO, eRSSUT);
- if (CheckIfAlreadySeen("RSS Item Seen",
- Ctx->ThisMsg->MsgGUID,
- IO->Now,
- IO->Now - USETABLE_ANTIEXPIRE_HIRES,
- eCheckUpdate,
- CCID, IO->ID)
- != 0)
+ seenstamp = CheckIfAlreadySeen("RSS Item Seen",
+ Ctx->ThisMsg->MsgGUID,
+ IO->Now,
+ antiExpire,
+ eCheckUpdate,
+ CCID, IO->ID);
+ if (seenstamp < antiExpire)
{
/* Item has already been seen */
EVRSSC_syslog(LOG_DEBUG,
- "%s has already been seen\n",
- ChrPtr(Ctx->ThisMsg->MsgGUID));
+ "%s has already been seen - %ld < %ld",
+ ChrPtr(Ctx->ThisMsg->MsgGUID),
+ seenstamp, antiExpire);
+
SetRSSState(IO, eRSSParsing);
if (GetNextHashPos(Ctx->Messages,
else
#endif
{
+ /* Item has already been seen */
+ EVRSSC_syslog(LOG_DEBUG,
+ "%s Parsing - %ld >= %ld",
+ ChrPtr(Ctx->ThisMsg->MsgGUID),
+ seenstamp, antiExpire);
SetRSSState(IO, eRSSParsing);
NextDBOperation(IO, RSSSaveMessage);