X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3fbdc96d45fbf2abcc93ed2e8ad206bc540be92b..76e72f65da97e7482da0a1eb0b110ca323f21643:/server/dbupgrade.c
diff --git a/server/dbupgrade.c b/server/dbupgrade.c
index 7f4eeac..bd08eed 100644
--- a/server/dbupgrade.c
+++ b/server/dbupgrade.c
@@ -1,46 +1,26 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
-
-#include
-#include "types.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "syscalls.h"
-#include "log.h"
-#include "defs.h"
-#include "kvp.h"
-#include "rights.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "mem.h"
-#include "configuration.h"
-#include "unicode.h"
-#include "version.h"
+/** @file server/dbupgrade.c
+ * @brief Database upgrade utility
+ *
+ * Invoked by the server when necessary.
+ */
+#include "disorder-server.h"
static DB_TXN *global_tid;
@@ -138,9 +118,9 @@ static int scan_core(const char *name, DB *db,
* Everything happens inside the @p global_tid tranasction. @p callback
* should return 0 or DB_LOCK_DEADLOCK.
*/
-static void scan(const char *name, DB *db,
- int (*callback)(const char *name, DB *db, DBC *c,
- DBT *k, DBT *d)) {
+static void scandb(const char *name, DB *db,
+ int (*callback)(const char *name, DB *db, DBC *c,
+ DBT *k, DBT *d)) {
info("scanning %s", name);
for(;;) {
global_tid = trackdb_begin_transaction();
@@ -312,16 +292,16 @@ static void upgrade(void) {
/* Normalize keys and values as required. We will also remove aliases as
* they will be regenerated when we re-noticed the tracks. */
info("renormalizing keys");
- scan("tracks.db", trackdb_tracksdb, remove_aliases_normalize_keys);
- scan("prefs.db", trackdb_prefsdb, normalize_keys);
- scan("global.db", trackdb_globaldb, normalize_keys);
- scan("noticed.db", trackdb_noticeddb, normalize_values);
+ scandb("tracks.db", trackdb_tracksdb, remove_aliases_normalize_keys);
+ scandb("prefs.db", trackdb_prefsdb, normalize_keys);
+ scandb("global.db", trackdb_globaldb, normalize_keys);
+ scandb("noticed.db", trackdb_noticeddb, normalize_values);
/* search.db and tags.db we will rebuild */
info("regenerating search database and aliases");
truncate_database("search.db", trackdb_searchdb);
truncate_database("tags.db", trackdb_tagsdb);
/* Regenerate the search database and aliases */
- scan("tracks.db", trackdb_tracksdb, renotice);
+ scandb("tracks.db", trackdb_tracksdb, renotice);
/* Finally update the database version */
snprintf(buf, sizeof buf, "%ld", config->dbversion);
trackdb_set_global("_dbversion", buf, 0);