* more work on the wiki revision control engine

[citadel.git] / citadel / modules / wiki / serv_wiki.c

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 78d58a0b8ca37ea168b3a4b9e89e5733a8b58a4d..04f0c966baf613d8780719f980bf213260184af6 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -54,13 +54,18 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        struct CitContext *CCC = CC;
        long old_msgnum = (-1L);
        struct CtdlMessage *old_msg = NULL;
+       long history_msgnum = (-1L);
+       struct CtdlMessage *history_msg = NULL;
        char diff_old_filename[PATH_MAX];
        char diff_new_filename[PATH_MAX];
        char diff_cmd[PATH_MAX];
        FILE *fp;
-       char *s;
-       char buf[1024];
        int rv;
+       char history_page[1024];
+       char boundary[256];
+       int nbytes = 0;
+       char *diffbuf = NULL;
+       size_t diffbuf_len = 0;
 
        if (!CCC->logged_in) return(0); /* Only do this if logged in. */
 
@@ -81,6 +86,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        /* See if we can retrieve the previous version. */
        old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CCC->room);
        if (old_msgnum <= 0L) return(0);
+       snprintf(history_page, sizeof history_page, "%s_HISTORY_", msg->cm_fields['E']);
 
        old_msg = CtdlFetchMessage(old_msgnum, 1);
        if (old_msg == NULL) return(0);
@@ -102,27 +108,79 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        CtdlMakeTempFileName(diff_old_filename, sizeof diff_old_filename);
        CtdlMakeTempFileName(diff_new_filename, sizeof diff_new_filename);
 
-       fp = fopen(diff_new_filename, "w");
-       rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
-       fclose(fp);
-
        fp = fopen(diff_old_filename, "w");
        rv = fwrite(old_msg->cm_fields['M'], strlen(old_msg->cm_fields['M']), 1, fp);
        fclose(fp);
-
        CtdlFreeMessage(old_msg);
 
-       snprintf(diff_cmd, sizeof diff_cmd, "diff -u %s %s", diff_new_filename, diff_old_filename);
+       fp = fopen(diff_new_filename, "w");
+       rv = fwrite(msg->cm_fields['M'], strlen(msg->cm_fields['M']), 1, fp);
+       fclose(fp);
+
+       diffbuf_len = 0;
+       diffbuf = NULL;
+       snprintf(diff_cmd, sizeof diff_cmd, "diff -u %s %s", diff_old_filename, diff_new_filename);
        fp = popen(diff_cmd, "r");
        if (fp != NULL) {
-               while (s = fgets(buf, sizeof buf, fp), (s != NULL)) {
-                       CtdlLogPrintf(CTDL_DEBUG, "\033[32m%s\033[0m", s);
-               }
+               do {
+                       diffbuf = realloc(diffbuf, diffbuf_len + 1025);
+                       nbytes = fread(&diffbuf[diffbuf_len], 1, 1024, fp);
+                       diffbuf_len += nbytes;
+               } while (nbytes == 1024);
+               diffbuf[diffbuf_len] = 0;
                pclose(fp);
        }
+       CtdlLogPrintf(CTDL_DEBUG, "diff length is %d bytes\n", diffbuf_len);
 
        unlink(diff_old_filename);
        unlink(diff_new_filename);
+
+       /* Determine whether this was a bogus (empty) edit */
+       if ((diffbuf_len = 0) && (diffbuf != NULL)) {
+               free(diffbuf);
+               diffbuf = NULL;
+       }
+       if (diffbuf == NULL) {
+               return(1);              /* No changes at all?  Abandon the post entirely! */
+       }
+
+       free(diffbuf);  /* FIXME do something with it */
+
+       /* Now look for the existing edit history */
+
+       history_msgnum = locate_message_by_euid(history_page, &CCC->room);
+       history_msg = NULL;
+       if (history_msgnum > 0L) {
+               history_msg = CtdlFetchMessage(old_msgnum, 1);
+       }
+
+       /* Create a new history message if necessary */
+       if (history_msg == NULL) {
+               history_msg = malloc(sizeof(struct CtdlMessage));
+               memset(history_msg, 0, sizeof(struct CtdlMessage));
+               history_msg->cm_magic = CTDLMESSAGE_MAGIC;
+               history_msg->cm_anon_type = MES_NORMAL;
+               history_msg->cm_format_type = FMT_RFC822;
+               history_msg->cm_fields['A'] = strdup("Citadel");
+               history_msg->cm_fields['R'] = strdup(CCC->room.QRname);
+               snprintf(boundary, sizeof boundary, "Citadel--Multipart--%04x--%08lx", getpid(), time(NULL));
+               history_msg->cm_fields['M'] = malloc(1024);
+               snprintf(history_msg->cm_fields['M'], 1024,
+                       "Content-type: multipart/mixed; boundary=\"%s\"\n\n"
+                       "This is a Citadel wiki history encoded as multipart MIME.\n"
+                       "--%s--\n"
+                       ,
+                       boundary, boundary
+               );
+       }
+
+       /* Update the history message (regardless of whether it's new or existing) */
+       /* FIXME now do something with it */
+       CtdlLogPrintf(CTDL_DEBUG, "\033[31m%s\033[0m", history_msg->cm_fields['M']);
+
+       /* FIXME */
+
+       free(history_msg);
        return(0);
 }