X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=b4c0dc5f8a3c96b7c4b1d92508036e45ed2c3e7e;hb=42fb5e0431fb09240a4423f6f38c15cfc0648437;hp=740ac9cc03a65dc65c23225ed9e51e3eead244a3;hpb=330dfe997d099ee125cea44b52adec83af1face6;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 740ac9c..b4c0dc5 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -60,9 +60,6 @@ struct conf_config
 static char *parse_settings(struct conf_config *config,
                             NMEM nmem, xmlNode *node);
 
-static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
-                                                        xmlNode *node);
-
 static void conf_metadata_assign(NMEM nmem, 
                                  struct conf_metadata * metadata,
                                  const char *name,
@@ -122,7 +119,6 @@ static struct conf_service *service_init(struct conf_server *server,
     service->next = 0;
     service->settings = 0;
     service->databases = 0;
-    service->targetprofiles = 0;
     service->server = server;
     service->session_timeout = 60; /* default session timeout */
     service->z3950_session_timeout = 180;
@@ -515,17 +511,6 @@ static struct conf_service *service_create_static(struct conf_server *server,
         }
         else if (!strcmp((const char *) n->name, "settings"))
             got_settings++;
-        else if (!strcmp((const char *) n->name, (const char *) "targetprofiles"))
-        {
-            if (service->targetprofiles)
-            {
-                yaz_log(YLOG_FATAL, "Can't repeat targetprofiles");
-                return 0;
-            }
-            if (!(service->targetprofiles = 
-                  parse_targetprofiles(service->nmem, n)))
-                return 0;
-        }
         else if (!strcmp((const char *) n->name, "relevance"))
         {
             if (service->relevance_pct)
@@ -570,15 +555,15 @@ static struct conf_service *service_create_static(struct conf_server *server,
         }
         else if (!strcmp((const char *) n->name, "facet"))
         {
-            if (service->mergekey_pct)
+            if (service->facet_pct)
             {
-                yaz_log(YLOG_LOG, "facety may not repeat in service");
+                yaz_log(YLOG_LOG, "facet may not repeat in service");
                 return 0;
             }
             else
             {
                 service->facet_pct = pp2_charset_create_xml(n);
-                if (!service->mergekey_pct)
+                if (!service->facet_pct)
                     return 0;
             }
         }
@@ -882,43 +867,6 @@ WRBUF conf_get_fname(struct conf_config *config, const char *fname)
     return w;
 }
 
-static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
-                                                        xmlNode *node)
-{
-    struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r));
-    xmlChar *type = xmlGetProp(node, (xmlChar *) "type");
-    xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
-
-    memset(r, 0, sizeof(*r));
-
-    if (type)
-    {
-        if (!strcmp((const char *) type, "local"))
-            r->type = Targetprofiles_local;
-        else
-        {
-            yaz_log(YLOG_FATAL, "Unknown targetprofile type");
-            return 0;
-        }
-    }
-    else
-    {
-        yaz_log(YLOG_FATAL, "Must specify type for targetprofile");
-        return 0;
-    }
-
-    if (src)
-        r->src = nmem_strdup(nmem, (const char *) src);
-    else
-    {
-        yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
-        return 0;
-    }
-    xmlFree(type);
-    xmlFree(src);
-    return r;
-}
-
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id)
 {
@@ -1122,7 +1070,8 @@ void config_process_events(struct conf_config *conf)
 }
 
 int config_start_listeners(struct conf_config *conf,
-                           const char *listener_override)
+                           const char *listener_override,
+                           const char *record_fname)
 {
     struct conf_server *ser;
 
@@ -1149,7 +1098,7 @@ int config_start_listeners(struct conf_config *conf,
                 wrbuf_printf(w, "%d", ser->port);
             }
         }
-        r = http_init(wrbuf_cstr(w), ser);
+        r = http_init(wrbuf_cstr(w), ser, record_fname);
         wrbuf_destroy(w);
         if (r)
             return -1;