X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=8d8d48fd44f90f01a33af30aa31394444ed8580e;hb=bb76bca1e2b4969ea08cf2f1f57d74cfa31dd026;hp=2b1c3d37bd92a5e24983b2e1c2852ff1e97f903d;hpb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 2b1c3d3..8d8d48f 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -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);