X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/feb5361ac535c09eb8dbda4cd25157c77764c287..24b8c863b154e1bee674597ffcd818d4d959c9a1:/lookup.c

diff --git a/lookup.c b/lookup.c
index c3b4908..56394a5 100644
--- a/lookup.c
+++ b/lookup.c
@@ -17,7 +17,6 @@
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "cleanup.h"
-#include "config.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -26,6 +25,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
+#include "version.h"
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
@@ -40,9 +40,9 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 	int count = 0;
 
 	if (ishex) {
-		count = fetch_key(keyid, &publickey, false);
+		count = config.dbbackend->fetch_key(keyid, &publickey, false);
 	} else {
-		count = fetch_key_text(search, &publickey);
+		count = config.dbbackend->fetch_key_text(search, &publickey);
 	}
 	if (publickey != NULL) {
 		if (mrhkp) {
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
+	int result;
 
 	params = getcgivars(argc, argv);
 	for (i = 0; params != NULL && params[i] != NULL; i += 2) {
@@ -104,7 +105,7 @@ int main(int argc, char *argv[])
 			search = params[i+1];
 			params[i+1] = NULL;
 			if (search != NULL) {
-				keyid = strtoul(search, &end, 16);
+				keyid = strtoull(search, &end, 16);
 				if (*search != 0 &&
 						end != NULL &&
 						*end == 0) {
@@ -159,12 +160,22 @@ int main(int argc, char *argv[])
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
 		catchsignals();
-		initdb(true);
+		config.dbbackend->initdb(false);
 		switch (op) {
 		case OP_GET:
-			logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
-					keyid);
-			if (fetch_key(keyid, &publickey, false)) {
+			if (ishex) {
+				result = config.dbbackend->fetch_key(keyid,
+					&publickey, false);
+			} else {
+				result = config.dbbackend->fetch_key_text(
+					search,
+					&publickey);
+			}
+			if (result) {
+				logthing(LOGTHING_NOTICE, 
+					"Found %d key(s) for search %s",
+					result,
+					search);
 				puts("<pre>");
 				cleankeys(publickey);
 				flatten_publickey(publickey,
@@ -176,7 +187,8 @@ int main(int argc, char *argv[])
 				puts("</pre>");
 			} else {
 				logthing(LOGTHING_NOTICE,
-					"Failed to fetch key.");
+					"Failed to find key for search %s",
+					search);
 				puts("Key not found");
 			}
 			break;
@@ -189,11 +201,13 @@ int main(int argc, char *argv[])
 					true, mrhkp);
 			break;
 		case OP_PHOTO:
-			if (fetch_key(keyid, &publickey, false)) {
+			if (config.dbbackend->fetch_key(keyid, &publickey,
+					false)) {
 				unsigned char *photo = NULL;
 				size_t         length = 0;
 
-				if (getphoto(publickey, 0, &photo, &length)) {
+				if (getphoto(publickey, indx, &photo,
+						&length)) {
 					fwrite(photo,
 							1,
 							length,
@@ -206,13 +220,13 @@ int main(int argc, char *argv[])
 		default:
 			puts("Unknown operation!");
 		}
-		cleanupdb();
+		config.dbbackend->cleanupdb();
 		cleanuplogthing();
 		cleanupconfig();
 	}
 	if (!mrhkp) {
 		puts("<hr>");
-		puts("Produced by onak " PACKAGE_VERSION 
+		puts("Produced by onak " ONAK_VERSION 
 				" by Jonathan McDowell");
 		end_html();
 	}