DLAT and OPNA now accept either a part number or a content-id.

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 8ae8a4d3d9b948d01f2f755aa7476ded047807a8..b809bec20dc4d69f0d4aa36baeee4208d2e5b00f 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -925,14 +925,14 @@ void memfmout(
  */
 void list_this_part(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
-                   void *cbuserdata)
+                   char *cbid, void *cbuserdata)
 {
        struct ma_info *ma;
        
        ma = (struct ma_info *)cbuserdata;
        if (ma->is_ma == 0) {
-               cprintf("part=%s|%s|%s|%s|%s|%ld\n",
-                       name, filename, partnum, disp, cbtype, (long)length);
+               cprintf("part=%s|%s|%s|%s|%s|%ld|%s\n",
+                       name, filename, partnum, disp, cbtype, (long)length, cbid);
        }
 }
 
@@ -941,7 +941,7 @@ void list_this_part(char *name, char *filename, char *partnum, char *disp,
  */
 void list_this_pref(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
-                   void *cbuserdata)
+                   char *cbid, void *cbuserdata)
 {
        struct ma_info *ma;
        
@@ -960,7 +960,7 @@ void list_this_pref(char *name, char *filename, char *partnum, char *disp,
  */
 void list_this_suff(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
-                   void *cbuserdata)
+                   char *cbid, void *cbuserdata)
 {
        struct ma_info *ma;
        
@@ -979,47 +979,49 @@ void list_this_suff(char *name, char *filename, char *partnum, char *disp,
  */
 void mime_download(char *name, char *filename, char *partnum, char *disp,
                   void *content, char *cbtype, char *cbcharset, size_t length,
-                  char *encoding, void *cbuserdata)
+                  char *encoding, char *cbid, void *cbuserdata)
 {
 
-       /* Silently go away if there's already a download open... */
+       /* Silently go away if there's already a download open. */
        if (CC->download_fp != NULL)
                return;
 
-       /* ...or if this is not the desired section */
-       if (strcasecmp(CC->download_desired_section, partnum))
-               return;
-
-       CC->download_fp = tmpfile();
-       if (CC->download_fp == NULL)
-               return;
-
-       fwrite(content, length, 1, CC->download_fp);
-       fflush(CC->download_fp);
-       rewind(CC->download_fp);
-
-       OpenCmdResult(filename, cbtype);
+       if (
+               (!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
+       ||      (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
+       ) {
+               CC->download_fp = tmpfile();
+               if (CC->download_fp == NULL)
+                       return;
+       
+               fwrite(content, length, 1, CC->download_fp);
+               fflush(CC->download_fp);
+               rewind(CC->download_fp);
+       
+               OpenCmdResult(filename, cbtype);
+       }
 }
 
 
 
 /*
- * Callback function for mime parser that outputs a section all at once
+ * Callback function for mime parser that outputs a section all at once.
+ * We can specify the desired section by part number *or* content-id.
  */
 void mime_spew_section(char *name, char *filename, char *partnum, char *disp,
                   void *content, char *cbtype, char *cbcharset, size_t length,
-                  char *encoding, void *cbuserdata)
+                  char *encoding, char *cbid, void *cbuserdata)
 {
        int *found_it = (int *)cbuserdata;
 
-       /* ...or if this is not the desired section */
-       if (strcasecmp(CC->download_desired_section, partnum))
-               return;
-
-       *found_it = 1;
-
-       cprintf("%d %d\n", BINARY_FOLLOWS, (int)length);
-       client_write(content, length);
+       if (
+               (!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
+       ||      (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
+       ) {
+               *found_it = 1;
+               cprintf("%d %d\n", BINARY_FOLLOWS, (int)length);
+               client_write(content, length);
+       }
 }
 
 
@@ -1161,7 +1163,7 @@ void CtdlFreeMessage(struct CtdlMessage *msg)
  */
 void fixed_output_pre(char *name, char *filename, char *partnum, char *disp,
                void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
-               void *cbuserdata)
+               char *cbid, void *cbuserdata)
 {
        struct ma_info *ma;
        
@@ -1181,7 +1183,7 @@ void fixed_output_pre(char *name, char *filename, char *partnum, char *disp,
  */
 void fixed_output_post(char *name, char *filename, char *partnum, char *disp,
                void *content, char *cbtype, char *cbcharset, size_t length,
-               char *encoding, void *cbuserdata)
+               char *encoding, char *cbid, void *cbuserdata)
 {
        struct ma_info *ma;
        
@@ -1201,7 +1203,7 @@ void fixed_output_post(char *name, char *filename, char *partnum, char *disp,
  */
 void fixed_output(char *name, char *filename, char *partnum, char *disp,
                void *content, char *cbtype, char *cbcharset, size_t length,
-               char *encoding, void *cbuserdata)
+               char *encoding, char *cbid, void *cbuserdata)
 {
        char *ptr;
        char *wptr;
@@ -1274,7 +1276,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp,
  */
 void choose_preferred(char *name, char *filename, char *partnum, char *disp,
                void *content, char *cbtype, char *cbcharset, size_t length,
-               char *encoding, void *cbuserdata)
+               char *encoding, char *cbid, void *cbuserdata)
 {
        char buf[1024];
        int i;
@@ -1304,7 +1306,7 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp,
  */
 void output_preferred(char *name, char *filename, char *partnum, char *disp,
                void *content, char *cbtype, char *cbcharset, size_t length,
-               char *encoding, void *cbuserdata)
+               char *encoding, char *cbid, void *cbuserdata)
 {
        int i;
        char buf[128];
@@ -1352,7 +1354,7 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp,
        /* No translations required or possible: output as text/plain */
        cprintf("Content-type: text/plain\n\n");
        fixed_output(name, filename, partnum, disp, content, cbtype, cbcharset,
-                       length, encoding, cbuserdata);
+                       length, encoding, cbid, cbuserdata);
 }
 
 
@@ -1368,7 +1370,7 @@ struct encapmsg {
  */
 void extract_encapsulated_message(char *name, char *filename, char *partnum, char *disp,
                   void *content, char *cbtype, char *cbcharset, size_t length,
-                  char *encoding, void *cbuserdata)
+                  char *encoding, char *cbid, void *cbuserdata)
 {
        struct encapmsg *encap;
 
@@ -1417,11 +1419,10 @@ int CtdlOutputMsg(long msg_num,         /* message number (local) to fetch */
        /* FIXME: check message id against msglist for this room */
 
        /*
-        * Fetch the message from disk.  If we're in any sort of headers
-        * only mode, request that we don't even bother loading the body
-        * into memory.
+        * Fetch the message from disk.  If we're in HEADERS_FAST mode,
+        * request that we don't even bother loading the body into memory.
         */
-       if ( (headers_only == HEADERS_FAST) || (headers_only == HEADERS_ONLY) ) {
+       if (headers_only == HEADERS_FAST) {
                TheMessage = CtdlFetchMessage(msg_num, 0);
        }
        else {