X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=41e0f06a03cd6c7c0224045345c09e4010325f33;hb=275d917ce676df4f41fa9fe097154fc5528615a2;hp=2a871a4e7021beaac1cc80d65c273903f004894f;hpb=da186c5b5656cd210b2a8a8d9c75d2af0c8c3f66;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 2a871a4..41e0f06 100644
--- a/src/database.c
+++ b/src/database.c
@@ -106,47 +106,38 @@ struct database *new_database(const char *id, NMEM nmem)
     struct setting *idset;
 
     db = nmem_malloc(nmem, sizeof(*db));
-    memset(db, 0, sizeof(*db));
-
-    db->url = nmem_strdup(nmem, id);
-
+    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);
     idset = nmem_malloc(nmem, sizeof(*idset));
     idset->precedence = 0;
     idset->name = "pz:id";
-    idset->target = idset->value = db->url;
+    idset->target = idset->value = db->id;
     idset->next = 0;
     db->settings[PZ_ID] = idset;
-    db->next = 0;
-
-    return db;
-}
-
-static struct database *load_database(const char *id,
-                                      struct conf_service *service)
-{
-    struct database *db;
-
-    db = new_database(id, service->nmem);
-    
-    db->next = service->databases;
-    service->databases = db;
 
     return db;
 }
 
 // Return a database structure by ID. Load and add to list if necessary
 // new==1 just means we know it's not in the list
-struct database *find_database(const char *id, struct conf_service *service)
+struct database *create_database_for_service(const char *id,
+                                             struct conf_service *service)
 {
     struct database *p;
     for (p = service->databases; p; p = p->next)
-        if (!strcmp(p->url, id))
+        if (!strcmp(p->id, id))
             return p;
-    return load_database(id, service);
+    
+    p = new_database(id, service->nmem);
+    
+    p->next = service->databases;
+    service->databases = p;
+
+    return p;
 }
 
 // This whole session_grep database thing should be moved elsewhere