1.1 --- a/librazor/razor-internal.h	Fri Jun 20 15:10:34 2008 -0400
     1.2 +++ b/librazor/razor-internal.h	Mon Jun 23 14:04:47 2008 -0400
     1.3 @@ -61,26 +61,37 @@
     1.4  	struct razor_set_section sections[0];
     1.5  };
     1.6  
     1.7 -#define RAZOR_MAGIC 0x7a7a7a7a
     1.8 +#define RAZOR_MAGIC 		0x7a7a7a7a
     1.9 +#define RAZOR_DETAILS_MAGIC 	0x7a7a7a7b
    1.10 +#define RAZOR_FILES_MAGIC 	0x7a7a7a7c
    1.11  #define RAZOR_VERSION 1
    1.12  
    1.13 -#define RAZOR_STRING_POOL	0
    1.14 -#define RAZOR_PACKAGES		1
    1.15 -#define RAZOR_PROPERTIES	2
    1.16 -#define RAZOR_FILES		3
    1.17 -#define RAZOR_PACKAGE_POOL	4
    1.18 -#define RAZOR_PROPERTY_POOL	5
    1.19 -#define RAZOR_FILE_POOL		6
    1.20 +#define RAZOR_STRING_POOL		0
    1.21 +#define RAZOR_PACKAGES			1
    1.22 +#define RAZOR_PROPERTIES		2
    1.23 +#define RAZOR_PACKAGE_POOL		3
    1.24 +#define RAZOR_PROPERTY_POOL		4
    1.25 +
    1.26 +#define RAZOR_DETAILS_STRING_POOL	0
    1.27 +
    1.28 +#define RAZOR_FILES			0
    1.29 +#define RAZOR_FILE_POOL			1
    1.30 +#define RAZOR_FILE_STRING_POOL		2
    1.31  
    1.32  struct razor_package {
    1.33 -	uint32_t name  : 24;
    1.34 -	uint32_t flags : 8;
    1.35 +	uint name  : 24;
    1.36 +	uint flags : 8;
    1.37  	uint32_t version;
    1.38  	uint32_t arch;
    1.39 +	uint32_t summary;
    1.40 +	uint32_t description;
    1.41 +	uint32_t url;
    1.42 +	uint32_t license;
    1.43  	struct list_head properties;
    1.44  	struct list_head files;
    1.45  };
    1.46  
    1.47 +
    1.48  struct razor_property {
    1.49  	uint32_t name;
    1.50  	uint32_t flags;
    1.51 @@ -105,7 +116,11 @@
    1.52  	struct array package_pool;
    1.53   	struct array property_pool;
    1.54   	struct array file_pool;
    1.55 +	struct array file_string_pool;
    1.56 +	struct array details_string_pool;
    1.57  	struct razor_set_header *header;
    1.58 +	struct razor_set_header *details_header;
    1.59 +	struct razor_set_header *files_header;
    1.60  };
    1.61  
    1.62  struct import_entry {
    1.63 @@ -123,6 +138,8 @@
    1.64  struct razor_importer {
    1.65  	struct razor_set *set;
    1.66  	struct hashtable table;
    1.67 +	struct hashtable file_table;
    1.68 +	struct hashtable details_table;
    1.69  	struct razor_package *package;
    1.70  	struct array properties;
    1.71  	struct array files;