Sessions may be added per-session.

[pazpar2-moved-to-github.git] / src / database.c

diff --git a/src/database.c b/src/database.c
index 0a87d0c..3824a67 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -164,6 +164,7 @@ static struct database *load_database(const char *id,
 
     db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) * 
                                settings_num(service));
+    db->num_settings = settings_num(service);
     memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
     idset = nmem_malloc(service->nmem, sizeof(*idset));
     idset->precedence = 0;
@@ -229,7 +230,7 @@ static int match_criterion(struct setting **settings,
                            struct conf_service *service, 
                            struct database_criterion *c)
 {
-    int offset = settings_offset(service, c->name);
+    int offset = settings_lookup_offset(service, c->name);
     struct database_criterion_value *v;
 
     if (offset < 0)