X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsettings.c;h=ac66c5a8d35d5226bfe5920fcf5cc412891e0ed3;hb=44981e9f52420f6a42bb1ac55712f74a31d17020;hp=4d68651536bff10c61b5cfa68fa0d8043a94c5c5;hpb=47ecbb3e7bca55144e68207a6d11457680967749;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index 4d68651..ac66c5a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -76,6 +76,7 @@ static char *hard_settings[] = {
     "pz:query_syntax",
     "pz:facetmap:",
     "pz:limitmap:",
+    "pz:url",
     0
 };
 
@@ -333,7 +334,7 @@ void expand_settings_array(struct setting ***set_ar, int *num, int offset,
 
 // This is called from grep_databases -- adds/overrides setting for a target
 // This is also where the rules for precedence of settings are implemented
-static void update_database(void *context, struct database *db)
+static void update_database_fun(void *context, struct database *db)
 {
     struct setting *set = ((struct update_database_context *)
                            context)->set;
@@ -343,7 +344,7 @@ static void update_database(void *context, struct database *db)
     int offset;
 
     // Is this the right database?
-    if (!match_zurl(db->url, set->target))
+    if (!match_zurl(db->id, set->target))
         return;
 
     offset = settings_create_offset(service, set->name);
@@ -401,7 +402,7 @@ static void update_databases(void *client_data, struct setting *set)
     struct update_database_context context;
     context.set = set;
     context.service = service;
-    predef_grep_databases(&context, service, update_database);
+    predef_grep_databases(&context, service, update_database_fun);
 }
 
 // This simply copies the 'hard' (application-specific) settings
@@ -442,7 +443,7 @@ static void prepare_target_dictionary(void *client_data, struct setting *set)
 
     // If target address is not wildcard, add the database
     if (*set->target && !zurl_wildcard(set->target))
-        find_database(set->target, service);
+        create_database_for_service(set->target, service);
 
     // Determine if we already have a dictionary entry
     if (!strncmp(set->name, "pz:", 3) && (p = strchr(set->name + 3, ':')))