X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/a745dd436a29ef2ca2a1a83582e3cfd53b24dcc5..05b75f8d50b83e943af3be4071449304d82dbdcd:/server/dump.c?ds=sidebyside

diff --git a/server/dump.c b/server/dump.c
index ec1fc4d..aec1804 100644
--- a/server/dump.c
+++ b/server/dump.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,33 +18,7 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <pcre.h>
-#include <unistd.h>
-#include <db.h>
-#include <fcntl.h>
-
-#include "configuration.h"
-#include "syscalls.h"
-#include "log.h"
-#include "client.h"
-#include "sink.h"
-#include "mem.h"
-#include "defs.h"
-#include "printf.h"
-#include "kvp.h"
-#include "vector.h"
-#include "inputline.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "charset.h"
+#include "disorder-server.h"
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
@@ -81,13 +55,6 @@ static void help(void) {
   exit(0);
 }
 
-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-
 /* dump prefs to FP, return nonzero on error */
 static void do_dump(FILE *fp, const char *tag,
 		    int tracksdb, int searchdb) {
@@ -157,6 +124,24 @@ static void do_dump(FILE *fp, const char *tag,
     }
     if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
     cursor = 0;
+
+    /* dump the schedule */
+    cursor = trackdb_opencursor(trackdb_scheduledb, tid);
+    err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+                        DB_FIRST);
+    while(err == 0) {
+      if(fputc('W', fp) < 0
+         || urlencode(s, k.data, k.size)
+         || fputc('\n', fp) < 0
+         || urlencode(s, d.data, d.size)
+         || fputc('\n', fp) < 0)
+        fatal(errno, "error writing to %s", tag);
+      err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+                          DB_NEXT);
+    }
+    if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
+    cursor = 0;
+    
     
     if(tracksdb) {
       cursor = trackdb_opencursor(trackdb_tracksdb, tid);
@@ -303,6 +288,7 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
   if((err = truncdb(tid, trackdb_searchdb))) return err;
   if((err = truncdb(tid, trackdb_tagsdb))) return err;
   if((err = truncdb(tid, trackdb_usersdb))) return err;
+  if((err = truncdb(tid, trackdb_scheduledb))) return err;
   c = getc(fp);
   while(!ferror(fp) && !feof(fp)) {
     switch(c) {
@@ -316,6 +302,7 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
     case 'P':
     case 'G':
     case 'U':
+    case 'W':
       switch(c) {
       case 'P':
 	which_db = trackdb_prefsdb;
@@ -329,13 +316,17 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
 	which_db = trackdb_usersdb;
 	which_name = "users.db";
 	break;
+      case 'W':				/* for 'when' */
+	which_db = trackdb_scheduledb;
+	which_name = "scheduledb.db";
+	break;
       default:
 	abort();
       }
       if(undump_dbt(fp, tag, prepare_data(&k))
          || undump_dbt(fp, tag, prepare_data(&d)))
         break;
-      switch(err = trackdb_prefsdb->put(which_db, tid, &k, &d, 0)) {
+      switch(err = which_db->put(which_db, tid, &k, &d, 0)) {
       case 0:
         break;
       case DB_LOCK_DEADLOCK:
@@ -453,7 +444,7 @@ int main(int argc, char **argv) {
   while((n = getopt_long(argc, argv, "hVc:dDutsrRaP", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
-    case 'V': version();
+    case 'V': version("disorder-dump");
     case 'c': configfile = optarg; break;
     case 'd': dump = 1; break;
     case 'u': undump = 1; break;