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

diff --git a/lookup.c b/lookup.c
index 3431690..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
@@ -160,24 +160,22 @@ int main(int argc, char *argv[])
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
 		catchsignals();
-		config.dbbackend->initdb(true);
+		config.dbbackend->initdb(false);
 		switch (op) {
 		case OP_GET:
 			if (ishex) {
-				logthing(LOGTHING_NOTICE, 
-					"Getting keyid 0x%llX",
-					keyid);
 				result = config.dbbackend->fetch_key(keyid,
 					&publickey, false);
 			} else {
-				logthing(LOGTHING_NOTICE, 
-					"Getting key(s) for search text %s",
-					search);
 				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,
@@ -189,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;
@@ -207,7 +206,8 @@ int main(int argc, char *argv[])
 				unsigned char *photo = NULL;
 				size_t         length = 0;
 
-				if (getphoto(publickey, 0, &photo, &length)) {
+				if (getphoto(publickey, indx, &photo,
+						&length)) {
 					fwrite(photo,
 							1,
 							length,
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
 	}
 	if (!mrhkp) {
 		puts("<hr>");
-		puts("Produced by onak " PACKAGE_VERSION 
+		puts("Produced by onak " ONAK_VERSION 
 				" by Jonathan McDowell");
 		end_html();
 	}