implemented merging an patch making

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@9 07ea20a6-d2c5-0310-9e02-9ef735347d72

1 files changed, 13 insertions, 13 deletions

diff --git a/src/context.c b/src/context.c
index 00455ea..6512f0d 100644
--- a/src/context.c
+++ b/src/context.c
@@ -80,7 +80,7 @@ struct syrep_db_context* db_context_open(const char *filename) {
     if (!(c->package = package_open(filename)))
         goto fail;
 
-    path = package_get_item(c->package, "timestamp");
+    path = package_get_item(c->package, "timestamp", 1);
     if ((f = fopen(path, "r"))) {
         if (fscanf(f, "%i", &c->timestamp) != 1)
             c->timestamp = 0;
@@ -90,14 +90,14 @@ struct syrep_db_context* db_context_open(const char *filename) {
     if (!c->timestamp)
         c->timestamp = time(NULL);
 
-    path = package_get_item(c->package, "version");
+    path = package_get_item(c->package, "version", 1);
     if ((f = fopen(path, "r"))) {
         if (fscanf(f, "%u", &c->version) != 1)
             c->version = 0;
         fclose(f);
     }
     
-    path = package_get_item(c->package, "origin");
+    path = package_get_item(c->package, "origin", 1);
     if ((f = fopen(path, "r"))) {
         char hn[256];
         if (fgets(hn, sizeof(hn), f)) {
@@ -123,27 +123,27 @@ struct syrep_db_context* db_context_open(const char *filename) {
     }
 
     /* Creating database id_meta */
-    if (!(c->db_id_meta = open_db(package_get_item(c->package, "id_meta"), 0)))
+    if (!(c->db_id_meta = open_db(package_get_item(c->package, "id_meta", 1), 0)))
         goto fail;
 
     /* Creating database md_name */
-    if (!(c->db_md_name = open_db(package_get_item(c->package, "md_name"), 1)))
+    if (!(c->db_md_name = open_db(package_get_item(c->package, "md_name", 1), 1)))
         goto fail;
 
     /* Creating database name_md */
-    if (!(c->db_name_md = open_db(package_get_item(c->package, "name_md"), 1)))
+    if (!(c->db_name_md = open_db(package_get_item(c->package, "name_md", 1), 1)))
         goto fail;
 
     /* Creating database name_lastmd */
-    if (!(c->db_name_lastmd = open_db(package_get_item(c->package, "name_lastmd"), 0)))
+    if (!(c->db_name_lastmd = open_db(package_get_item(c->package, "name_lastmd", 1), 0)))
         goto fail;
 
     /* Creating database md_lastname */
-    if (!(c->db_md_lastname = open_db(package_get_item(c->package, "md_lastname"), 0)))
+    if (!(c->db_md_lastname = open_db(package_get_item(c->package, "md_lastname", 1), 0)))
         goto fail;
     
     /* Creating database version_timestamp */
-    if (!(c->db_version_timestamp = open_db(package_get_item(c->package, "version_timestamp"), 0)))
+    if (!(c->db_version_timestamp = open_db(package_get_item(c->package, "version_timestamp", 1), 0)))
         goto fail;
     
     return c;
@@ -157,7 +157,7 @@ fail:
 
 int db_context_save(struct syrep_db_context *c, const char *filename) {
     FILE *f;
-    assert(c && c->package && filename);
+    assert(c && c->package);
 
     if (c->db_id_meta)
         c->db_id_meta->sync(c->db_id_meta, 0);
@@ -177,19 +177,19 @@ int db_context_save(struct syrep_db_context *c, const char *filename) {
     if (c->db_version_timestamp)
         c->db_version_timestamp->sync(c->db_version_timestamp, 0);
         
-    if (!(f = fopen(package_get_item(c->package, "timestamp"), "w+")))
+    if (!(f = fopen(package_get_item(c->package, "timestamp", 1), "w+")))
         return -1;
 
     fprintf(f, "%i\n", c->timestamp);
     fclose(f);
 
-    if (!(f = fopen(package_get_item(c->package, "version"), "w+")))
+    if (!(f = fopen(package_get_item(c->package, "version", 1), "w+")))
         return -1;
 
     fprintf(f, "%u\n", c->version);
     fclose(f);
 
-    if (!(f = fopen(package_get_item(c->package, "origin"), "w+")))
+    if (!(f = fopen(package_get_item(c->package, "origin", 1), "w+")))
         return -1;
 
     fprintf(f, "%s\n", c->origin);