X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Flistdeliver%2Fserv_listdeliver.c;h=793291b44d16cdd9000d32660533ffabaaa065f9;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=2fe3bcec50dd898371908f2f62e7c9a36c7d030c;hpb=77dc5d1730634ba7d115ca63e4ce937aa2466d5d;p=citadel.git

diff --git a/citadel/modules/listdeliver/serv_listdeliver.c b/citadel/modules/listdeliver/serv_listdeliver.c
index 2fe3bcec5..793291b44 100644
--- a/citadel/modules/listdeliver/serv_listdeliver.c
+++ b/citadel/modules/listdeliver/serv_listdeliver.c
@@ -43,8 +43,86 @@
 int doing_listdeliver = 0;
 
 
+// data passed back and forth between listdeliver_do_msg() and listdeliver_sweep_room()
+struct lddata {
+	long msgnum;		// number of most recent message processed
+	char *netconf;		// netconfig for this room (contains the recipients)
+};
+
+
+
+void listdeliver_do_msg(long msgnum, void *userdata) {
+	struct lddata *ld = (struct lddata *) userdata;
+	ld->msgnum = msgnum;
+	char buf[SIZ];
+
+	struct CtdlMessage *TheMessage = CtdlFetchMessage(msgnum, 1);
+
+	int config_lines = num_tokens(ld->netconf, '\n');
+	for (int i=0; i<config_lines; ++i) {
+		extract_token(buf, ld->netconf, i, '\n', sizeof buf);
+		if ( (!strncasecmp(buf, "listrecp|", 9)) || (!strncasecmp(buf, "digestrecp|", 11)) ) {
+			syslog(LOG_DEBUG, "\033[32mDeliver %ld to %s\033[0m", msgnum, buf);
+			// FIXME
+		}
+	}
+	CM_Free(TheMessage);
+}
+
 
 void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) {
+	char *netconfig = NULL;
+	long lastsent = 0;
+	char buf[SIZ];
+	int config_lines;
+	int i;
+	int number_of_messages_processed = 0;
+	int number_of_recipients = 0;
+	struct lddata ld;
+
+	if (CtdlGetRoom(&CC->room, qrbuf->QRname)) {
+		syslog(LOG_DEBUG, "listdeliver: no room <%s>", qrbuf->QRname);
+		return;
+	}
+
+        netconfig = LoadRoomNetConfigFile(qrbuf->QRnumber);
+        if (!netconfig) {
+		return;				// no netconfig, no processing, no problem
+	}
+
+	config_lines = num_tokens(netconfig, '\n');
+	for (i=0; i<config_lines; ++i) {
+		extract_token(buf, netconfig, i, '\n', sizeof buf);
+
+		if (!strncasecmp(buf, "lastsent|", 9)) {
+			lastsent = atol(&buf[9]);
+		}
+		else if ( (!strncasecmp(buf, "listrecp|", 9)) || (!strncasecmp(buf, "digestrecp|", 11)) ) {
+			++number_of_recipients;
+		}
+	}
+
+	if (number_of_recipients > 0) {
+		syslog(LOG_DEBUG, "listdeliver: processing new messages in <%s> for <%d> recipients", qrbuf->QRname, number_of_recipients);
+		ld.netconf = netconfig;
+		number_of_messages_processed = CtdlForEachMessage(MSGS_GT, lastsent, NULL, NULL, NULL, listdeliver_do_msg, &ld);
+		syslog(LOG_DEBUG, "listdeliver: processed %d messages", number_of_messages_processed);
+	
+		if (number_of_messages_processed > 0) {
+			syslog(LOG_DEBUG, "listdeliver: new lastsent is %ld", ld.msgnum);
+
+			// FIXME write lastsent back to netconfig
+			syslog(LOG_DEBUG, "\033[31mBEFORE:<%s>\033[0m", netconfig);
+			syslog(LOG_DEBUG, "\033[32mAFTER:<%s>\033[0m", netconfig);
+
+
+
+
+
+		}
+	}
+
+	free(netconfig);
 }
 
 
@@ -76,6 +154,8 @@ void listdeliver_sweep(void) {
 	syslog(LOG_DEBUG, "listdeliver: ended");
 	last_run = time(NULL);
 	doing_listdeliver = 0;
+
+	exit(0);
 }