X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=10cf7905560c4747e3816e76090afe31759df5ce;hb=aaf2ab15830321d9db33cd2e47f739fb52324110;hp=9496de66e8dd3e4b2a397342010683a1819b485c;hpb=401da56d4a26f687cd42024bdef6f29a29bb7663;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 9496de6..10cf790 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.117 2007-03-19 14:40:07 adam Exp $
+ * $Id: zoom-c.c,v 1.118 2007-03-19 20:58:34 adam Exp $
  */
 /**
  * \file zoom-c.c
@@ -27,8 +27,6 @@
 #include <yaz/cql.h>
 #include <yaz/ccl.h>
 
-#define TASK_FIX 1
-
 static int log_api = 0;
 static int log_details = 0;
 
@@ -168,9 +166,7 @@ static void set_dset_error(ZOOM_connection c, int error,
                 c, c->host_port ? c->host_port : "<>", dset, error,
                 addinfo ? addinfo : "",
                 addinfo2 ? addinfo2 : "");
-#if TASK_FIX
         ZOOM_connection_remove_tasks(c);
-#endif
     }
 }
 
@@ -857,22 +853,10 @@ ZOOM_API(ZOOM_resultset)
     return r;
 }
 
-/*
- * This is the old result-set sorting API, which is maintained only
- * for the sake of binary compatibility.  There is no reason ever to
- * use this rather than ZOOM_resultset_sort1().
- */
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_resultset_sort(ZOOM_resultset r,
                         const char *sort_type, const char *sort_spec)
 {
-    (void) ZOOM_resultset_sort1(r, sort_type, sort_spec);
-}
-
-ZOOM_API(int)
-    ZOOM_resultset_sort1(ZOOM_resultset r,
-                         const char *sort_type, const char *sort_spec)
-{
     ZOOM_connection c = r->connection;
     ZOOM_task task;
     ZOOM_query newq;
@@ -1300,7 +1284,7 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c)
                     odr_prepend(c->odr_out, "ZOOM-C",
                                 ireq->implementationName));
     
-    version = odr_strdup(c->odr_out, "$Revision: 1.117 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.118 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     ireq->implementationVersion = 
@@ -2659,21 +2643,21 @@ static zoom_ret send_present(ZOOM_connection c)
 }
 
 ZOOM_API(ZOOM_scanset)
-    ZOOM_connection_scan(ZOOM_connection c, const char *start)
+    ZOOM_connection_scan_pqf(ZOOM_connection c, const char *start)
 {
     ZOOM_scanset s;
     ZOOM_query q = ZOOM_query_create();
 
     ZOOM_query_prefix(q, start);
 
-    s = ZOOM_connection_scan1(c, q);
+    s = ZOOM_connection_scan(c, q);
     ZOOM_query_destroy(q);
     return s;
 
 }
 
 ZOOM_API(ZOOM_scanset)
-    ZOOM_connection_scan1(ZOOM_connection c, ZOOM_query q)
+    ZOOM_connection_scan(ZOOM_connection c, ZOOM_query q)
 {
     char *start;
     char *freeme = 0;
@@ -2873,11 +2857,12 @@ ZOOM_API(const char *)
     return ZOOM_options_get(scan->options, key);
 }
 
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_scanset_option_set(ZOOM_scanset scan, const char *key,
                             const char *val)
 {
     ZOOM_options_set(scan->options, key, val);
+    return 0;
 }
 
 static Z_APDU *create_es_package(ZOOM_package p, int type)
@@ -3329,11 +3314,12 @@ ZOOM_API(const char *)
 }
 
 
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_package_option_set(ZOOM_package p, const char *key,
                             const char *val)
 {
     ZOOM_options_set(p->options, key, val);
+    return 0;
 }
 
 static int ZOOM_connection_exec_task(ZOOM_connection c)
@@ -3897,18 +3883,20 @@ ZOOM_API(const char *)
     return ZOOM_options_getl(c->options, key, lenp);
 }
 
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_connection_option_set(ZOOM_connection c, const char *key,
                                const char *val)
 {
     ZOOM_options_set(c->options, key, val);
+    return 0;
 }
 
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_connection_option_setl(ZOOM_connection c, const char *key,
                                 const char *val, int len)
 {
     ZOOM_options_setl(c->options, key, val, len);
+    return 0;
 }
 
 ZOOM_API(const char *)
@@ -3917,11 +3905,12 @@ ZOOM_API(const char *)
     return ZOOM_options_get(r->options, key);
 }
 
-ZOOM_API(void)
+ZOOM_API(int)
     ZOOM_resultset_option_set(ZOOM_resultset r, const char *key,
                               const char *val)
 {
     ZOOM_options_set(r->options, key, val);
+    return 0;
 }