Continued replacing references to [get_put]_msglist() with better code.

For some reason, cmd_msgs() still doesn't always work right.

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 6f52404a44d52cf71ade7efc011b629555e3d808..2a2f08aa65d34c36ed517be26c91f2c1dbf7ee3e 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -197,29 +197,45 @@ void CtdlForEachMessage(int mode, long ref,
 
        int a;
        struct visit vbuf;
+        struct cdbdata *cdbfr;
+       long *msglist = NULL;
+       int num_msgs = 0;
+       long thismsg;
 
        get_mm();
-       get_msglist(&CC->quickroom);
        getuser(&CC->usersupp, CC->curr_user);
        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
-       if (CC->num_msgs != 0) for (a = 0; a < (CC->num_msgs); ++a) {
-               if ((MessageFromList(a) >= 0)
+        cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+        if (cdbfr != NULL) {
+               msglist = mallok(cdbfr->len);
+               memcpy(msglist, cdbfr->ptr, cdbfr->len);
+               num_msgs = cdbfr->len / sizeof(long);
+               cdb_free(cdbfr);
+       } else {
+               return;
+       }
+
+       if (num_msgs > 0) for (a = 0; a < (num_msgs); ++a) {
+               thismsg = msglist[a];
+               lprintf(9, "CtdlForEachMessage() iterating msg %ld\n", thismsg);
+               if ((thismsg >= 0)
                    && (
 
                               (mode == MSGS_ALL)
-                              || ((mode == MSGS_OLD) && (MessageFromList(a) <= vbuf.v_lastseen))
-                              || ((mode == MSGS_NEW) && (MessageFromList(a) > vbuf.v_lastseen))
-                              || ((mode == MSGS_NEW) && (MessageFromList(a) >= vbuf.v_lastseen)
+                              || ((mode == MSGS_OLD) && (thismsg <= vbuf.v_lastseen))
+                              || ((mode == MSGS_NEW) && (thismsg > vbuf.v_lastseen))
+                              || ((mode == MSGS_NEW) && (thismsg >= vbuf.v_lastseen)
                            && (CC->usersupp.flags & US_LASTOLD))
-                              || ((mode == MSGS_LAST) && (a >= (CC->num_msgs - ref)))
+                              || ((mode == MSGS_LAST) && (a >= (num_msgs - ref)))
                    || ((mode == MSGS_FIRST) && (a < ref))
-                              || ((mode == MSGS_GT) && (MessageFromList(a) > ref))
+                              || ((mode == MSGS_GT) && (thismsg > ref))
                    )
                    ) {
-                       CallBack(MessageFromList(a));
+                       CallBack(thismsg);
                }
        }
+       phree(msglist);
 }
 
 
@@ -1456,12 +1472,10 @@ int CtdlDeleteMessages( char *room_name,        /* which room */
 
        if (num_msgs > 0) {
                for (i=0; i<num_msgs; ++i) {
-                       lprintf(9, "Evaluating message d\n", i);
                        delete_this = 0x00;
 
                        /* Set/clear a bit for each criterion */
 
-                       lprintf(9, "Message number is <%ld>\n", msglist[i]);
                        if ( (dmsgnum == 0L) || (msglist[i]==dmsgnum) ) {
                                delete_this  |= 0x01;
                        }
@@ -1470,8 +1484,6 @@ int CtdlDeleteMessages(   char *room_name,        /* which room */
                                delete_this |= 0x02;
                        } else {
                                GetSuppMsgInfo(&smi, msglist[i]);
-                               lprintf(9, "Content type is <%s>\n",
-                                       smi.smi_content_type);
                                if (!strcasecmp(smi.smi_content_type,
                                   content_type)) {
                                        delete_this |= 0x02;

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index cbbc75c6413345f1fe5a77f4e931898d088fc3c1..f208849deafe62c8ce16beea5fd0d954c39ef4f7 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -367,9 +367,6 @@ void delete_msglist(struct quickroom *whichroom)
 
 /* 
  * Add a message number to a room's message list.  
- * So, why doesn't this function use the get_msglist() and put_msglist() stuff
- * defined above?  Because the room the message number is being written to
- * may not be the current room (as is the case with cmd_move() for example).
  *
  * This function returns the highest message number present in the room after
  * the add operation is performed - which is not necessarily the message