From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 19 Apr 2012 10:28:34 +0000 (+0200)
Subject: New method to create new database with inherited settings from service
X-Git-Tag: v1.6.13~40
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=6f9e90cf2c4bca753cf64448eb6893a7c3cd5fe8;p=pazpar2-moved-to-github.git

New method to create new database with inherited settings from service
---

diff --git a/src/database.c b/src/database.c
index 139950b..d6fb757 100644
--- a/src/database.c
+++ b/src/database.c
@@ -56,21 +56,36 @@ struct database_criterion {
 
 struct database *new_database(const char *id, NMEM nmem)
 {
+    return new_database_inherit_settings(id, nmem, 0);
+}
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings *service_settings)
+{
     struct database *db;
     struct setting *idset;
 
     db = nmem_malloc(nmem, sizeof(*db));
     db->id = nmem_strdup(nmem, id);
-    db->num_settings = PZ_MAX_EOF;
-    db->settings = nmem_malloc(nmem, sizeof(struct settings*) * 
-                               db->num_settings);
     db->next = 0;
-    memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+
+    if (service_settings && service_settings->num_settings > 0) {
+        yaz_log(YLOG_LOG, "copying values from service settings");
+        db->num_settings = service_settings->num_settings;
+        db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
+        // Initialize database settings with service settings
+        memcpy(db->settings, service_settings->settings,  sizeof(struct settings*) * db->num_settings);
+
+    }
+    else {
+        yaz_log(YLOG_LOG, "No service settings delivered");
+        db->num_settings = PZ_MAX_EOF;
+        db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
+        memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+    }
     idset = nmem_malloc(nmem, sizeof(*idset));
     idset->precedence = 0;
     idset->name = "pz:id";
     idset->target = idset->value = db->id;
-    idset->next = 0;
+    idset->next = db->settings[PZ_ID];
     db->settings[PZ_ID] = idset;
 
     return db;
@@ -86,8 +101,9 @@ struct database *create_database_for_service(const char *id,
         if (!strcmp(p->id, id))
             return p;
     
-    p = new_database(id, service->nmem);
-    
+    yaz_log(YLOG_LOG, "new database from service %s values %p", service->id, service->settings);
+    p = new_database_inherit_settings(id, service->nmem, service->settings);
+
     p->next = service->databases;
     service->databases = p;