X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=264d3bf255c7564917b242c39f6ba56faef3aff2;hb=d83ed24b0cf7522f931e689eefb6f7f6d74b8b28;hp=ac66c5a8d35d5226bfe5920fcf5cc412891e0ed3;hpb=44981e9f52420f6a42bb1ac55712f74a31d17020;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index ac66c5a..264d3bf 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -77,6 +77,8 @@ static char *hard_settings[] = {
     "pz:facetmap:",
     "pz:limitmap:",
     "pz:url",
+    "pz:sortmap:",
+    "pz:present_chunk:",
     0
 };
 
@@ -436,22 +438,10 @@ static void initialize_soft_settings(struct conf_service *service)
 static void prepare_target_dictionary(void *client_data, struct setting *set)
 {
     struct conf_service *service = (struct conf_service *) client_data;
-    struct setting_dictionary *dictionary = service->dictionary;
-
-    int i;
-    char *p;
 
     // If target address is not wildcard, add the database
     if (*set->target && !zurl_wildcard(set->target))
         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, ':')))
-        *(p + 1) = '\0';
-    for (i = 0; i < dictionary->num; i++)
-        if (!strcmp(dictionary->dict[i], set->name))
-            return;
-    yaz_log(YLOG_WARN, "Setting '%s' not configured as metadata", set->name);
 }
 
 void init_settings(struct conf_service *service)