X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=sixdegrees.c;h=d4e55c180cb654877a8a9888e3364b7cd9be3d11;hb=5b3f77c7fbafb036d20a1577ed74f475e94ed821;hp=f2700290bdedc1b3bc64fa5f7d5732cb65790546;hpb=cd002cef518222c140de94b8817874b072b2d918;p=onak.git

diff --git a/sixdegrees.c b/sixdegrees.c
index f270029..d4e55c1 100644
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
- *
- * $Id: sixdegrees.c,v 1.6 2004/03/23 12:33:47 noodles Exp $
  */
 
 #include <stdio.h>
@@ -15,6 +13,7 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
@@ -31,7 +30,8 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 
 	while (curll != NULL && curdegree <= maxdegree) {
 		if (sigs) {
-			sigll = cached_getkeysigs(((struct stats_key *)
+			sigll = config.dbbackend->cached_getkeysigs(
+				((struct stats_key *)
 				curll->object)->keyid);
 		} else {
 			sigll = NULL;
@@ -83,14 +83,14 @@ void sixdegrees(uint64_t keyid)
 	long degree;
 	char *uid;
 
-	cached_getkeysigs(keyid);
+	config.dbbackend->cached_getkeysigs(keyid);
 
 	if ((keyinfo = findinhash(keyid)) == NULL) {
 		printf("Couldn't find key 0x%llX.\n", keyid);
 		return;
 	}
 
-	uid = keyid2uid(keyinfo->keyid);
+	uid = config.dbbackend->keyid2uid(keyinfo->keyid);
 	printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
 	free(uid);
 	uid = NULL;
@@ -127,11 +127,13 @@ int main(int argc, char *argv[])
 	}
 
 	readconfig(NULL);
-	initdb(true);
+	initlogthing("sixdegrees", config.logfile);
+	config.dbbackend->initdb(true);
 	inithash();
-	sixdegrees(getfullkeyid(keyid));
+	sixdegrees(config.dbbackend->getfullkeyid(keyid));
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
+	cleanuplogthing();
 	cleanupconfig();
 
 	return 0;