* Merged in code from the TRANSACTIONS branch for testing.

[citadel.git] / citadel / serv_upgrade.c

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index cf24533404fe44e17aebb1ef27bb0eca157a1a9e..51d0e430f25baa4093cc18945c745627d15798c1 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -1,4 +1,10 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Transparently handle the upgrading of server data formats.
+ *
+ */
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,12 +18,8 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include "citadel.h"
 #include "server.h"
-#include <syslog.h>
 #include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
@@ -47,6 +49,7 @@ void do_pre555_usersupp_upgrade(void) {
        strcpy(tempfilename, tmpnam(NULL));
 
        /* First, back out all old version records to a flat file */
+       cdb_begin_transaction();
         cdb_rewind(CDB_USERSUPP);
         while(cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
                 memset(&usbuf, 0, sizeof(struct pre555usersupp));
@@ -56,10 +59,12 @@ void do_pre555_usersupp_upgrade(void) {
                 cdb_free(cdbus);
                fwrite(&usbuf, sizeof(struct pre555usersupp), 1, fp);
        }
+       cdb_end_transaction();
 
        /* ...and overwrite the records with new format records */
        rewind(fp);
        while (fread(&usbuf, sizeof(struct pre555usersupp), 1, fp) > 0) {
+           if (strlen(usbuf.fullname) > 0) {
                lprintf(9, "Upgrading <%s>\n", usbuf.fullname);
                memset(&newus, 0, sizeof(struct usersupp));
 
@@ -99,10 +104,10 @@ void do_pre555_usersupp_upgrade(void) {
                fwrite(vcard, strlen(vcard)+1, 1, tp);
                fclose(tp);
 
-               CtdlWriteObject(CONFIGROOM, "text/x-vcard",
-                       tempfilename, &newus, 0, 1);    
+               CtdlWriteObject(USERCONFIGROOM, "text/x-vcard",
+                       tempfilename, &newus, 0, 1, CM_SKIP_HOOKS);
                unlink(tempfilename);
-
+           }
        }
 
        fclose(fp);     /* this file deletes automatically */
@@ -122,7 +127,7 @@ void check_server_upgrades(void) {
                (CitControl.version / 100),
                (CitControl.version % 100) );
 
-       if (CitControl.version < config.c_setup_level) {
+       if (CitControl.version < REV_LEVEL) {
                lprintf(5, "Server hosted updates need to be processed at "
                                "this time.  Please wait...\n");
        }
@@ -130,11 +135,9 @@ void check_server_upgrades(void) {
                return;
        }
 
-
        if (CitControl.version < 555) do_pre555_usersupp_upgrade();
 
-
-       CitControl.version = config.c_setup_level;
+       CitControl.version = REV_LEVEL;
        put_control();
 }