X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=8d8d48fd44f90f01a33af30aa31394444ed8580e;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=528fef4e6b30d4166bd06b64cd41e6c7da34022d;hpb=d4f4953be4ef81eb92e8d55926610db4b69a8d31;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 528fef4..8d8d48f 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 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
@@ -55,7 +55,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 struct connection {
     IOCHAN iochan;
     ZOOM_connection link;
-    ZOOM_resultset resultset;
     struct host *host;
     struct client *client;
     char *ibuf;
@@ -95,18 +94,6 @@ ZOOM_connection connection_get_link(struct connection *co)
     return co->link;
 }
 
-ZOOM_resultset connection_get_resultset(struct connection *co)
-{
-    return co->resultset;
-}
-
-void connection_set_resultset(struct connection *co, ZOOM_resultset rs)
-{
-    if (co->resultset)
-        ZOOM_resultset_destroy(co->resultset);
-    co->resultset = rs;
-}
-
 static void remove_connection_from_host(struct connection *con)
 {
     struct connection **conp = &con->host->connections;
@@ -131,9 +118,6 @@ void connection_destroy(struct connection *co)
         ZOOM_connection_destroy(co->link);
         iochan_destroy(co->iochan);
     }
-    if (co->resultset)
-        ZOOM_resultset_destroy(co->resultset);
-
     yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
 
     remove_connection_from_host(co);
@@ -169,7 +153,6 @@ static struct connection *connection_create(struct client *cl)
     new->zproxy = 0;
     client_set_connection(cl, new);
     new->link = 0;
-    new->resultset = 0;
     new->state = Conn_Resolving;
     if (host->ipport)
         connection_connect(new);
@@ -368,10 +351,8 @@ static int connection_connect(struct connection *con)
     assert(con);
 
     ZOOM_options_set(zoptions, "async", "1");
-    ZOOM_options_set(zoptions, "implementationName",
-            global_parameters.implementationName);
-    ZOOM_options_set(zoptions, "implementationVersion",
-            global_parameters.implementationVersion);
+    ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
+    ZOOM_options_set(zoptions, "implementationVersion", VERSION);
     if (zproxy && *zproxy)
     {
         con->zproxy = xstrdup(zproxy);
@@ -479,7 +460,9 @@ int client_prep_connection(struct client *cl)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+