Added CtdlWriteObject() to store generic data in the msgbase

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index d1f438b0b8995242a06fdb7eb758e2d27081abe9..d3a0078cd3058d120e0efdf8e109f91dd9dfe12e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,6 @@
 Thu Jul 22 22:26:50 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Moved message deletion into new API function CtdlDeleteMessages()
+       * Added CtdlWriteObject() to store generic data in the msgbase
 
 Tue Jul 20 22:14:54 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Moved the actual work done in cmd_msgs() into a new API function

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 3bd446765eb0348320047f6a5b32e5d2bf590810..278b10e412253a49d713f3c90a3f7afae8ba270a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -988,6 +988,8 @@ void save_message(char *mtmp,       /* file containing proper message */
                a = strlen(mptr);
                while (--a) {
                        if (!strncasecmp(mptr, "Content-type: ", 14)) {
+                               safestrncpy(content_type, mptr,
+                                       sizeof(content_type));
                                lprintf(9, "%s\n", content_type);
                                strcpy(content_type, &content_type[14]);
                                for (a=0; a<strlen(content_type); ++a)
@@ -1432,6 +1434,9 @@ int CtdlDeleteMessages(   char *room_name,        /* which room */
        int delete_this;
        struct SuppMsgInfo smi;
 
+       lprintf(9, "CtdlDeleteMessages(%s, %ld, %s)\n",
+               room_name, dmsgnum, content_type);
+
        /* get room record, obtaining a lock... */
        if (lgetroom(&qrbuf, room_name) != 0) {
                lprintf(7, "CtdlDeleteMessages(): Room <%s> not found\n",
@@ -1441,6 +1446,7 @@ int CtdlDeleteMessages(   char *room_name,        /* which room */
 
         cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
 
+       lprintf(9, "doing mallok/memcpy loop\n");
         if (cdbfr != NULL) {
                msglist = mallok(cdbfr->len);
                memcpy(msglist, cdbfr->ptr, cdbfr->len);
@@ -1448,37 +1454,45 @@ int CtdlDeleteMessages( char *room_name,        /* which room */
                cdb_free(cdbfr);
        }
 
-       if (num_msgs > 0) for (i=0; i<num_msgs; ++i) {
-               delete_this = 0x00;
+       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 */
+                       /* Set/clear a bit for each criterion */
 
-               if ( (dmsgnum == 0L) || (msglist[i]==dmsgnum) ) {
-                       delete_this  |= 0x01;
-               }
+                       lprintf(9, "Message number is <%ld>\n", msglist[i]);
+                       if ( (dmsgnum == 0L) || (msglist[i]==dmsgnum) ) {
+                               delete_this  |= 0x01;
+                       }
 
-               if (content_type == NULL) {
-                       delete_this |= 0x02;
-               } else {
-                       GetSuppMsgInfo(&smi, msglist[i]);
-                       if (!strcasecmp(smi.smi_content_type, content_type)) {
+                       if (content_type == NULL) {
                                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;
+                               }
+                       }
+       
+                       /* Delete message only if all bits are set */
+                       if (delete_this == 0x03) {
+                               AdjRefCount(msglist[i], -1);
+                               msglist[i] = 0L;
+                               ++num_deleted;
                        }
                }
+       
+               num_msgs = sort_msglist(msglist, num_msgs);
+               cdb_store(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long),
+                       msglist, (num_msgs * sizeof(long)) );
 
-               /* Delete message only if all bits are set */
-               if (delete_this == 0x03) {
-                       AdjRefCount(msglist[i], -1);
-                       msglist[i] = 0L;
-                       ++num_deleted;
-               }
+               qrbuf.QRhighest = msglist[num_msgs - 1];
        }
 
-       num_msgs = sort_msglist(msglist, num_msgs);
-       cdb_store(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long),
-               msglist, (num_msgs * sizeof(long)) );
-
-       qrbuf.QRhighest = msglist[num_msgs - 1];
        lputroom(&qrbuf);
        lprintf(9, "%d message(s) deleted.\n", num_deleted);
        return(num_deleted);
@@ -1654,3 +1668,72 @@ void AdjRefCount(long msgnum, int incr)
                cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
        }
 }
+
+
+/*
+ * Write a generic object to this room
+ */
+void CtdlWriteObject(  char *req_room,         /* Room to stuff it in */
+                       char *content_type,     /* MIME type of this object */
+                       char *tempfilename,     /* Where to fetch it from */
+                       int is_mailbox,         /* Private mailbox room? */
+                       int is_binary,          /* Is encoding necessary? */
+                       int is_unique           /* Del others of this type? */
+                       ) {
+
+       FILE *fp, *tempfp;
+       char filename[PATH_MAX];
+       char cmdbuf[256];
+       int ch;
+       struct quickroom qrbuf;
+       char roomname[ROOMNAMELEN];
+
+       if (is_mailbox) MailboxName(roomname, &CC->usersupp, req_room); 
+       else safestrncpy(roomname, req_room, sizeof(roomname));
+
+       strcpy(filename, tmpnam(NULL));
+       fp = fopen(filename, "w");
+       if (fp == NULL) return;
+
+       fprintf(fp, "%c%c%c", 0xFF, MES_NORMAL, 4);
+       fprintf(fp, "T%ld%c", time(NULL), 0);
+       fprintf(fp, "A%s%c", CC->usersupp.fullname, 0);
+       fprintf(fp, "O%s%c", roomname, 0);
+       fprintf(fp, "N%s%c", config.c_nodename, 0);
+       fprintf(fp, "MContent-type: %s\n", content_type);
+
+       tempfp = fopen(tempfilename, "r");
+       if (tempfp == NULL) {
+               fclose(fp);
+               unlink(filename);
+               return;
+       }
+
+       if (is_binary == 0) {
+               fprintf(fp, "Content-transfer-encoding: 7bit\n\n");
+               while (ch=getc(tempfp), ch>0) putc(ch, fp);
+               fclose(tempfp);
+               putc(0, fp);
+               fclose(fp);
+       } else {
+               fprintf(fp, "Content-transfer-encoding: base64\n\n");
+               fclose(tempfp);
+               fclose(fp);
+               sprintf(cmdbuf, "./base64 -e <%s >>%s",
+                       tempfilename, filename);
+               system(cmdbuf);
+       }
+
+       /* Create the requested room if we have to. */
+       if (getroom(&qrbuf, roomname) != 0) {
+               create_room(roomname, 4, "", 0);
+       }
+
+       /* If the caller specified this object as unique, delete all
+        * other objects of this type that are currently in the room.
+        */
+       CtdlDeleteMessages(roomname, 0L, content_type);
+
+       /* Now write the data */
+       save_message(filename, "", roomname, MES_LOCAL, 1);
+}

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 90904c43d54d27a9b0ec469628dced532ef50114..f4f8660e5b80ff70218c248e6192e4b40762832e 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -32,3 +32,4 @@ void simple_listing(long);
 void CtdlForEachMessage(int mode, long ref,
                         void (*CallBack) (long msgnum) );
 int CtdlDeleteMessages(char *, long, char *);
+void CtdlWriteObject(char *, char *, char *, int, int, int);

diff --git a/citadel/serv_icq.c b/citadel/serv_icq.c
index 93ba14b4509eb58ee3b04577c16e2b5339f09ea3..e7514002da8be9ba32a351f08bc21fc93825ecdf 100644 (file)
--- a/citadel/serv_icq.c
+++ b/citadel/serv_icq.c
@@ -8,6 +8,9 @@
 
  $Id$
  $Log$
+ Revision 1.2  1999/07/23 04:27:45  ajc
+ Added CtdlWriteObject() to store generic data in the msgbase
+
  Revision 1.1  1999/07/19 04:12:49  ajc
          * serv_icq.c, serv_icq.mk: added (separate makefile is temporary)
 
@@ -84,6 +87,8 @@ struct ctdl_icq_handle {
 };
 
 /* <ig> */
+#define ICQROOM                "My ICQ Config"
+#define ICQMIME                "application/x-citadel-icq"
 unsigned long SYM_CTDL_ICQ;
 #define ThisICQ ((struct ctdl_icq_handle *)CtdlGetUserData(SYM_CTDL_ICQ))
 extern struct CitContext *ContextList;
@@ -1824,9 +1829,18 @@ void CtdlICQ_Config_Delete(char *key) {
 
 /* Write a key */
 void CtdlICQ_Config_Write(char *key, char *contents) {
+
+       char buf[256]; /* FIX */
+
        CtdlICQ_Config_Delete(key);
        fseek(ThisICQ->icq_MyConfigFile, 0L, SEEK_END);
        fprintf(ThisICQ->icq_MyConfigFile, "%s %s\n", key, contents);
+
+       /****** FIX ****** TEMPORARY HACK TO SEE STUFF ***********/
+
+       fflush(ThisICQ->icq_MyConfigFile);
+       sprintf(buf, "icq/%ld", CC->usersupp.usernum);
+       CtdlWriteObject(ICQROOM, ICQMIME, buf, 1, 0, 1);
 }