# HG changeset patch
# User James Bowes <jbowes@redhat.com>
# Date 1212964164 14400
# Node ID c51f49f38d180b48c2d818f507892bfce713d5e1
# Parent  5803b6151d02f4366240c759f107becc422492e2
Add url and license package data as well

diff -r 5803b6151d02 -r c51f49f38d18 main.c
--- a/main.c	Sun Jun 08 17:11:41 2008 -0400
+++ b/main.c	Sun Jun 08 18:29:24 2008 -0400
@@ -817,6 +817,7 @@
 	struct razor_package_iterator *pi;
 	struct razor_package *package;
 	const char *pattern = argv[0], *name, *version, *arch;
+	const char *summary, *description, *url, *license;
 
 	set = razor_set_open(repo_filename);
 	pi = razor_package_iterator_create(set);
@@ -825,12 +826,17 @@
 		if (pattern && fnmatch(pattern, name, 0) != 0)
 			continue;
 
+		razor_package_get_details (set, package, &summary, &description,
+					   &url, &license);
+
 		printf ("Name:        %s\n", name);
 		printf ("Arch:        %s\n", arch);
 		printf ("Version:     %s\n", version);
-		printf ("Summary:     %s\n", razor_package_get_summary (set, package));
+		printf ("URL:         %s\n", url);
+		printf ("License:     %s\n", license);
+		printf ("Summary:     %s\n", summary);
 		printf ("Description:\n");
-		printf ("%s\n", razor_package_get_description (set, package));
+		printf ("%s\n", description);
 		printf ("\n");
 	}
 	razor_package_iterator_destroy(pi);
diff -r 5803b6151d02 -r c51f49f38d18 razor.c
--- a/razor.c	Sun Jun 08 17:11:41 2008 -0400
+++ b/razor.c	Sun Jun 08 18:29:24 2008 -0400
@@ -63,10 +63,12 @@
 struct razor_package {
 	uint name  : 24;
 	uint flags : 8;
+	uint32_t version;
+	uint32_t arch;
 	uint32_t summary;
 	uint32_t description;
-	uint32_t version;
-	uint32_t arch;
+	uint32_t url;
+	uint32_t license;
 	struct list_head properties;
 	struct list_head files;
 };
@@ -332,10 +334,15 @@
 void
 razor_importer_add_details(struct razor_importer *importer,
 			   const char *summary,
-			   const char *description)
+			   const char *description,
+			   const char *url,
+			   const char *license)
 {
 	importer->package->summary = hashtable_tokenize(&importer->table, summary);
 	importer->package->description = hashtable_tokenize(&importer->table, description);
+	importer->package->url = hashtable_tokenize(&importer->table, url);
+	importer->package->license = hashtable_tokenize(&importer->table, license);
+
 }
 
 void
@@ -921,18 +928,17 @@
 	return p;
 }
 
-const char *
-razor_package_get_summary(struct razor_set *set, struct razor_package *package)
+void
+razor_package_get_details(struct razor_set *set, struct razor_package *package,
+			  const char **summary, const char **description,
+			  const char **url, const char **license)
 {
 	const char *pool = set->string_pool.data;
-	return &pool[package->summary];
-}
-
-const char *
-razor_package_get_description(struct razor_set *set, struct razor_package *package)
-{
-	const char *pool = set->string_pool.data;
-	return &pool[package->description];
+
+	*summary = &pool[package->summary];
+	*description = &pool[package->description];
+	*url = &pool[package->url];
+	*license = &pool[package->license];
 }
 
 struct razor_property_iterator {
diff -r 5803b6151d02 -r c51f49f38d18 razor.h
--- a/razor.h	Sun Jun 08 17:11:41 2008 -0400
+++ b/razor.h	Sun Jun 08 18:29:24 2008 -0400
@@ -51,10 +51,10 @@
 struct razor_package *
 razor_set_get_package(struct razor_set *set, const char *package);
 
-const char *
-razor_package_get_summary(struct razor_set *set, struct razor_package *package);
-const char *
-razor_package_get_description(struct razor_set *set, struct razor_package *package);
+void
+razor_package_get_details(struct razor_set *set, struct razor_package *package,
+			  const char **summary, const char **description,
+			  const char **url, const char **license);
 
 struct razor_package_iterator;
 struct razor_package_iterator *
@@ -177,7 +177,9 @@
 				  const char *arch);
 void razor_importer_add_details(struct razor_importer *importer,
 				const char *summary,
-				const char *description);
+				const char *description,
+				const char *url,
+				const char *license);
 void razor_importer_add_property(struct razor_importer *importer,
 				 const char *name,
 				 enum razor_version_relation relation,
diff -r 5803b6151d02 -r c51f49f38d18 rpm.c
--- a/rpm.c	Sun Jun 08 17:11:41 2008 -0400
+++ b/rpm.c	Sun Jun 08 18:29:24 2008 -0400
@@ -673,7 +673,8 @@
 	rpmdbMatchIterator iter;
 	Header h;
 	int_32 type, count, i;
-	union rpm_entry name, epoch, version, release, arch, summary, description;
+	union rpm_entry name, epoch, version, release, arch;
+	union rpm_entry summary, description, url, license;
 	union rpm_entry basenames, dirnames, dirindexes;
 	char filename[PATH_MAX], evr[128], buf[16];
 	rpmdb db;
@@ -696,6 +697,8 @@
 		headerGetEntry(h, RPMTAG_ARCH, &type, &arch.p, &count);
 		headerGetEntry(h, RPMTAG_SUMMARY, &type, &summary.p, &count);
 		headerGetEntry(h, RPMTAG_DESCRIPTION, &type, &description.p, &count);
+		headerGetEntry(h, RPMTAG_URL, &type, &url.p, &count);
+		headerGetEntry(h, RPMTAG_LICENSE, &type, &license.p, &count);
 
 		if (epoch.flags != NULL) {
 			snprintf(buf, sizeof buf, "%u", *epoch.flags);
@@ -708,7 +711,9 @@
 
 		razor_importer_begin_package(importer,
 					     name.string, evr, arch.string);
-		razor_importer_add_details(importer, summary.string, description.string);
+		razor_importer_add_details(importer, summary.string,
+					   description.string, url.string,
+					   license.string);
 
 		add_properties(importer, RAZOR_PROPERTY_REQUIRES, h,
 			       RPMTAG_REQUIRENAME,
diff -r 5803b6151d02 -r c51f49f38d18 yum.c
--- a/yum.c	Sun Jun 08 17:11:41 2008 -0400
+++ b/yum.c	Sun Jun 08 18:29:24 2008 -0400
@@ -39,6 +39,8 @@
 	YUM_STATE_PACKAGE_ARCH,
 	YUM_STATE_SUMMARY,
 	YUM_STATE_DESCRIPTION,
+	YUM_STATE_URL,
+	YUM_STATE_LICENSE,
 	YUM_STATE_CHECKSUM,
 	YUM_STATE_REQUIRES,
 	YUM_STATE_PROVIDES,
@@ -54,7 +56,8 @@
 
 	struct razor_importer *importer;
 	struct import_property_context *current_property_context;
-	char name[256], arch[64], summary[512], description[4096], buffer[512], *p;
+	char name[256], arch[64], summary[512], description[4096];
+	char url[256], license[64], buffer[512], *p;
 	char pkgid[128];
 	int state;
 };
@@ -121,9 +124,15 @@
 	} else if (strcmp(name, "description") == 0) {
 		ctx->p = ctx->description;
 		ctx->state = YUM_STATE_DESCRIPTION;
+	} else if (strcmp(name, "url") == 0) {
+		ctx->p = ctx->url;
+		ctx->state = YUM_STATE_URL;
 	} else if (strcmp(name, "checksum") == 0) {
 		ctx->p = ctx->pkgid;
 		ctx->state = YUM_STATE_CHECKSUM;
+	} else if (strcmp(name, "rpm:license") == 0) {
+		ctx->p = ctx->license;
+		ctx->state = YUM_STATE_LICENSE;
 	} else if (strcmp(name, "rpm:requires") == 0) {
 		ctx->state = YUM_STATE_REQUIRES;
 	} else if (strcmp(name, "rpm:provides") == 0) {
@@ -198,6 +207,8 @@
 	case YUM_STATE_PACKAGE_ARCH:
 	case YUM_STATE_SUMMARY:
 	case YUM_STATE_DESCRIPTION:
+	case YUM_STATE_URL:
+	case YUM_STATE_LICENSE:
 	case YUM_STATE_CHECKSUM:
 	case YUM_STATE_FILE:
 		ctx->state = YUM_STATE_BEGIN;
@@ -205,7 +216,9 @@
 	}
 
 	if (strcmp(name, "package") == 0) {
-		razor_importer_add_details(ctx->importer, ctx->summary, ctx->description);
+		razor_importer_add_details(ctx->importer, ctx->summary,
+					   ctx->description, ctx->url,
+					   ctx->license);
 
 		XML_StopParser(ctx->current_parser, XML_TRUE);
 		ctx->current_parser = ctx->filelists_parser;
@@ -222,6 +235,8 @@
 	case YUM_STATE_PACKAGE_ARCH:
 	case YUM_STATE_SUMMARY:
 	case YUM_STATE_DESCRIPTION:
+	case YUM_STATE_URL:
+	case YUM_STATE_LICENSE:
 	case YUM_STATE_CHECKSUM:
 	case YUM_STATE_FILE:
 		memcpy(ctx->p, s, len);