removed dead, commened out code left from removing global Z39.50 proxying

diff --git a/src/client.c b/src/client.c
index bb1fd0c..c4147fa 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.7 2007-06-06 11:49:48 marc Exp $
+/* $Id: client.c,v 1.8 2007-06-06 11:56:35 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -235,7 +235,8 @@ void client_send_search(struct client *cl)
     for (ndb = 0; sdb->database->databases[ndb]; ndb++)
        databaselist[ndb] = sdb->database->databases[ndb];
 
-    if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) || *piggyback == '1')
+    if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) 
+        || *piggyback == '1')
     {
         if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
         {

diff --git a/src/config.c b/src/config.c
index 8214030..779ea57 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.35 2007-06-06 11:49:48 marc Exp $
+/* $Id: config.c,v 1.36 2007-06-06 11:56:35 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -19,7 +19,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
-/* $Id: config.c,v 1.35 2007-06-06 11:49:48 marc Exp $ */
+/* $Id: config.c,v 1.36 2007-06-06 11:56:35 marc Exp $ */
 
 #include <string.h>
 
@@ -453,22 +453,6 @@ static struct conf_server *parse_server(xmlNode *node)
             xmlFree(host);
             xmlFree(myurl);
         }
-/*         else if (!strcmp((const char *) n->name, "zproxy")) */
-/*         { */
-/*             xmlChar *port = 0; */
-/*             xmlChar *host = 0; */
-
-/*             port = xmlGetProp(n, (xmlChar *) "port"); */
-/*             host = xmlGetProp(n, (xmlChar *) "host"); */
-
-/*             if (port) */
-/*                 server->zproxy_port = atoi((const char *) port); */
-/*             if (host) */
-/*                 server->zproxy_host = nmem_strdup(nmem, (const char *) host); */
-
-/*             xmlFree(port); */
-/*             xmlFree(host); */
-/*         } */
         else if (!strcmp((const char *) n->name, "settings"))
         {
             if (server->settings)

diff --git a/src/logic.c b/src/logic.c
index 9776239..9c6c414 100644 (file)
--- a/src/logic.c
+++ b/src/logic.c
@@ -1,4 +1,4 @@
-/* $Id: logic.c,v 1.36 2007-06-06 11:49:48 marc Exp $
+/* $Id: logic.c,v 1.37 2007-06-06 11:56:35 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -79,7 +79,6 @@ struct parameters global_parameters =
 {
     "",
     "",
-    /* "", */
     "", 
     0,
     0, /* dump_records */
@@ -856,38 +855,6 @@ void start_proxy(void)
     http_set_proxyaddr(hp, ser->myurl ? ser->myurl : "");
 }
 
-/* void start_zproxy(void) */
-/* { */
-/*     struct conf_server *ser = global_parameters.server; */
-
-/*     if (*global_parameters.zproxy_override){ */
-/*         yaz_log(YLOG_LOG, "Z39.50 proxy  %s",  */
-/*                 global_parameters.zproxy_override); */
-/*         return; */
-/*     } */
-
-/*     else if (ser->zproxy_host || ser->zproxy_port) */
-/*     { */
-/*         char hp[128] = ""; */
-
-/*         strcpy(hp, ser->zproxy_host ? ser->zproxy_host : ""); */
-/*         if (ser->zproxy_port) */
-/*         { */
-/*             if (*hp) */
-/*                 strcat(hp, ":"); */
-/*             else */
-/*                 strcat(hp, "@:"); */
-
-/*             sprintf(hp + strlen(hp), "%d", ser->zproxy_port); */
-/*         } */
-/*         strcpy(global_parameters.zproxy_override, hp); */
-/*         yaz_log(YLOG_LOG, "Z39.50 proxy  %s",  */
-/*                 global_parameters.zproxy_override); */
-
-/*     } */
-/*     else */
-/*         return; */
-/* } */
 
 // Master list of connections we're handling events to
 static IOCHAN channel_list = 0; 

diff --git a/src/parameters.h b/src/parameters.h
index c4db163..c6ece74 100644 (file)
--- a/src/parameters.h
+++ b/src/parameters.h
@@ -1,4 +1,4 @@
-/* $Id: parameters.h,v 1.3 2007-06-06 11:49:48 marc Exp $
+/* $Id: parameters.h,v 1.4 2007-06-06 11:56:35 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -28,7 +28,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 struct parameters {
     char proxy_override[128];
     char listener_override[128];
-    //char zproxy_override[128];
     char settings_path_override[128];
     struct conf_server *server;
     int dump_records;