X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=a7d9c7c4f1c7dc8baecc74446e39dfb855ef84a7;hb=e38c96cef3f2b32a5f6e0bee8e845279f9dffead;hp=d48bc3f7cdbd30dfb428c1814d83e72c77ceb6ae;hpb=5b3f77c7fbafb036d20a1577ed74f475e94ed821;p=onak.git

diff --git a/lookup.c b/lookup.c
index d48bc3f..a7d9c7c 100644
--- a/lookup.c
+++ b/lookup.c
@@ -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) {
@@ -162,10 +163,21 @@ int main(int argc, char *argv[])
 		config.dbbackend->initdb(true);
 		switch (op) {
 		case OP_GET:
-			logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+			if (ishex) {
+				logthing(LOGTHING_NOTICE, 
+					"Getting keyid 0x%llX",
 					keyid);
-			if (config.dbbackend->fetch_key(keyid, &publickey,
-					false)) {
+				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) {
 				puts("<pre>");
 				cleankeys(publickey);
 				flatten_publickey(publickey,
@@ -195,7 +207,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,