X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=c3aecbe461734c06ef7df61a498f2cc2d787aa07;hb=63aaab39d8203c89d84e88d5093058aa55b7807a;hp=e2155dd9211c1f661df19053b2a25f05728afa97;hpb=d5be779678ef159bf7f18558cf08f5a0643425a0;p=pazpar2-moved-to-github.git

diff --git a/src/logic.c b/src/logic.c
index e2155dd..c3aecbe 100644
--- a/src/logic.c
+++ b/src/logic.c
@@ -346,7 +346,8 @@ static int prepare_map(struct session *se, struct session_database *sdb)
         {
             (*m) = nmem_malloc(se->session_nmem, sizeof(**m));
             (*m)->next = 0;
-            if (!((*m)->stylesheet = conf_load_stylesheet(stylesheets[i])))
+            if (!((*m)->stylesheet = conf_load_stylesheet(se->service->config,
+                                                          stylesheets[i])))
             {
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s",
                         stylesheets[i]);
@@ -501,7 +502,7 @@ static struct database_criterion *parse_filter(NMEM m, const char *buf)
 }
 
 enum pazpar2_error_code search(struct session *se,
-                               char *query, char *filter,
+                               const char *query, const char *filter,
                                const char **addinfo)
 {
     int live_channels = 0;
@@ -867,54 +868,10 @@ void statistics(struct session *se, struct statistics *stat)
     stat->num_clients = count;
 }
 
-int start_http_listener(struct conf_config *conf,
-                        const char *listener_override,
-                        const char *proxy_override)
-{
-    struct conf_server *ser;
-    for (ser = conf->servers; ser; ser = ser->next)
-    {
-        char hp[128];
-        *hp = '\0';
-        if (listener_override)
-        {
-            strcpy(hp, listener_override);
-            listener_override = 0; /* only first server is overriden */
-        }
-        else
-        {
-            strcpy(hp, ser->host ? ser->host : "");
-            if (ser->port)
-            {
-                if (*hp)
-                    strcat(hp, ":");
-                sprintf(hp + strlen(hp), "%d", ser->port);
-            }
-        }
-        if (http_init(hp, ser))
-            return -1;
-
-        *hp = '\0';
-        if (proxy_override)
-            strcpy(hp, proxy_override);
-        else if (ser->proxy_host || ser->proxy_port)
-        {
-            strcpy(hp, ser->proxy_host ? ser->proxy_host : "");
-            if (ser->proxy_port)
-            {
-                if (*hp)
-                    strcat(hp, ":");
-                sprintf(hp + strlen(hp), "%d", ser->proxy_port);
-            }
-        }
-        if (*hp)
-            http_set_proxyaddr(hp, ser->myurl ? ser->myurl : "");
-    }
-    return 0;
-}
 
 // Master list of connections we're handling events to
-static IOCHAN channel_list = 0; 
+static IOCHAN channel_list = 0;  /* thread pr */
+
 void pazpar2_add_channel(IOCHAN chan)
 {
     chan->next = channel_list;