X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=124d9db7eb23f3fb8495ab44dd2112af6f261086;hb=96707c992b975c2c9b500bd6a5075b5631e32e26;hp=5921e0ad33f60a20a938cf10f7ca8b82abfa9526;hpb=68b939b91cc0289ea298be500d17991617f53ed9;p=pazpar2-moved-to-github.git diff --git a/src/settings.c b/src/settings.c index 5921e0a..124d9db 100644 --- a/src/settings.c +++ b/src/settings.c @@ -71,7 +71,7 @@ static char *hard_settings[] = { "pz:max_connections", "pz:reuse_connections", "pz:termlist_term_factor", - "pz:termlist_term_cont", + "pz:termlist_term_count", "pz:preferred", "pz:extra_args", "pz:query_syntax", @@ -140,12 +140,12 @@ int settings_create_offset(struct conf_service *service, const char *name) return settings_index_lookup(service->dictionary, name, service->nmem); } -static int settings_lookup_offset(struct conf_service *service, const char *name) +int settings_lookup_offset(struct conf_service *service, const char *name) { return settings_index_lookup(service->dictionary, name, 0); } -static char *settings_name(struct conf_service *service, int offset) +char *settings_name(struct conf_service *service, int offset) { assert(offset < service->dictionary->num); return service->dictionary->dict[offset]; @@ -368,7 +368,7 @@ void expand_settings_array2(struct settings *settings, int offset, NMEM nmem) } } -void update_settings(struct setting *set, struct settings *settings, int offset, NMEM nmem) +static void update_settings(struct setting *set, struct settings *settings, int offset, NMEM nmem) { struct setting **sp; yaz_log(YLOG_LOG, "update service settings offset %d with %s=%s", offset, set->name, set->value); @@ -505,8 +505,6 @@ static void initialize_hard_settings(struct conf_service *service) void initialize_soft_settings(struct conf_service *service) { int i; - yaz_log(YLOG_LOG, "Init soft settings"); - for (i = 0; i < service->num_metadata; i++) { struct conf_metadata *md = &service->metadata[i]; @@ -516,20 +514,22 @@ void initialize_soft_settings(struct conf_service *service) // Also create setting for some metadata attributes. if (md->limitmap) { - yaz_log(YLOG_LOG, "Metadata %s has limitmap: %s ",md->name, md->limitmap); + int index; WRBUF wrbuf = wrbuf_alloc(); + yaz_log(YLOG_DEBUG, "Metadata %s has limitmap: %s ",md->name, md->limitmap); wrbuf_printf(wrbuf, "pz:limitmap:%s", md->name); - int index = settings_create_offset(service, wrbuf_cstr(wrbuf)); + index = settings_create_offset(service, wrbuf_cstr(wrbuf)); if (index >= 0) { - yaz_log(YLOG_LOG, "Service %s default %s=%s", - (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap); struct setting new; + int offset; + yaz_log(YLOG_DEBUG, "Service %s default %s=%s", + (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap); new.name = (char *) wrbuf_cstr(wrbuf); new.value = md->limitmap; new.next = 0; new.target = 0; new.precedence = 0; - int offset = settings_create_offset(service, new.name); + offset = settings_create_offset(service, new.name); update_settings(&new, service->settings, offset, service->nmem); } wrbuf_destroy(wrbuf);