More clean-up (remove util.c).

[pazpar2-moved-to-github.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index c5b10a8..8c12a9e 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -59,10 +59,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #include "pazpar2.h"
-
+#include "parameters.h"
 #include "client.h"
 #include "connection.h"
 #include "settings.h"
+#include "relevance.h"
 
 /** \brief Represents client state for a connection to one search target */
 struct client {
@@ -77,6 +78,7 @@ struct client {
     enum client_state state;
     struct show_raw *show_raw;
     struct client *next;     // next client in session or next in free list
+    ZOOM_resultset resultset;
 };
 
 struct show_raw {
@@ -100,7 +102,7 @@ static const char *client_states[] = {
     "Client_Disconnected"
 };
 
-static struct client *client_freelist = 0;
+static struct client *client_freelist = 0; /* thread pr */
 
 const char *client_get_state_str(struct client *cl)
 {
@@ -157,24 +159,18 @@ static void client_send_raw_present(struct client *cl);
 static int nativesyntax_to_type(struct session_database *sdb, char *type,
                                 ZOOM_record rec);
 
-static void client_show_immediate(struct client *cl, int position,
-                                  void *data,
-                                  void (*error_handler)(void *data, const char *addinfo),
-                                  void (*record_handler)(void *data, const char *buf,
-                                                         size_t sz),
-                                  int binary)
+static void client_show_immediate(
+    ZOOM_resultset resultset, struct session_database *sdb, int position,
+    void *data,
+    void (*error_handler)(void *data, const char *addinfo),
+    void (*record_handler)(void *data, const char *buf, size_t sz),
+    int binary)
 {
-    struct connection *co = cl->connection;
-    struct session_database *sdb = client_get_database(cl);
-    ZOOM_resultset resultset = 0;
     ZOOM_record rec = 0;
     char type[80];
     const char *buf;
     int len;
 
-    assert(co);
-
-    resultset = connection_get_resultset(co);
     if (!resultset)
     {
         error_handler(data, "no resultset");
@@ -208,16 +204,19 @@ int client_show_raw_begin(struct client *cl, int position,
                                                  size_t sz),
                           int binary)
 {
-    if (!cl->connection)
-        return -1;
-    
     if (syntax == 0 && esn == 0)
-        client_show_immediate(cl, position, data,
+        client_show_immediate(cl->resultset, client_get_database(cl),
+                              position, data,
                               error_handler, record_handler,
                               binary);
     else
     {
         struct show_raw *rr, **rrp;
+
+        if (!cl->connection)
+            return -1;
+    
+
         rr = xmalloc(sizeof(*rr));
         rr->position = position;
         rr->active = 0;
@@ -241,7 +240,7 @@ int client_show_raw_begin(struct client *cl, int position,
         
         if (cl->state == Client_Failed)
         {
-        client_show_raw_error(cl, "client failed");
+            client_show_raw_error(cl, "client failed");
         }
         else if (cl->state == Client_Disconnected)
         {
@@ -289,7 +288,7 @@ static void client_send_raw_present(struct client *cl)
 {
     struct session_database *sdb = client_get_database(cl);
     struct connection *co = client_get_connection(cl);
-    ZOOM_resultset set = connection_get_resultset(co);
+    ZOOM_resultset set = cl->resultset;
 
     int offset = cl->show_raw->position;
     const char *syntax = 0;
@@ -385,7 +384,7 @@ void client_search_response(struct client *cl)
     struct connection *co = cl->connection;
     struct session *se = cl->session;
     ZOOM_connection link = connection_get_link(co);
-    ZOOM_resultset resultset = connection_get_resultset(co);
+    ZOOM_resultset resultset = cl->resultset;
     const char *error, *addinfo;
 
     if (ZOOM_connection_error(link, &error, &addinfo))
@@ -408,7 +407,7 @@ void client_record_response(struct client *cl)
 {
     struct connection *co = cl->connection;
     ZOOM_connection link = connection_get_link(co);
-    ZOOM_resultset resultset = connection_get_resultset(co);
+    ZOOM_resultset resultset = cl->resultset;
     const char *error, *addinfo;
 
     if (ZOOM_connection_error(link, &error, &addinfo))
@@ -490,6 +489,7 @@ void client_start_search(struct client *cl)
     const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
     const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS);
     const char *opt_sru = session_setting_oneval(sdb, PZ_SRU);
+    const char *opt_sort = session_setting_oneval(sdb, PZ_SORT);
 
     assert(link);
 
@@ -522,12 +522,14 @@ void client_start_search(struct client *cl)
         ZOOM_connection_option_set(link, "databaseName", databaseName);
 
     ZOOM_connection_option_set(link, "presentChunk", "20");
-
+        
     if (cl->cqlquery)
     {
         ZOOM_query q = ZOOM_query_create();
         yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery);
         ZOOM_query_cql(q, cl->cqlquery);
+       if (*opt_sort)
+           ZOOM_query_sortby(q, opt_sort);
         rs = ZOOM_connection_search(link, q);
         ZOOM_query_destroy(q);
     }
@@ -536,7 +538,8 @@ void client_start_search(struct client *cl)
         yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
         rs = ZOOM_connection_search_pqf(link, cl->pquery);
     }
-    connection_set_resultset(co, rs);
+    ZOOM_resultset_destroy(cl->resultset);
+    cl->resultset = rs;
     connection_continue(co);
 }
 
@@ -560,6 +563,7 @@ struct client *client_create(void)
     r->diagnostic = 0;
     r->state = Client_Disconnected;
     r->show_raw = 0;
+    r->resultset = 0;
     r->next = 0;
     return r;
 }
@@ -582,6 +586,9 @@ void client_destroy(struct client *c)
 
     if (c->connection)
         connection_release(c->connection);
+
+    ZOOM_resultset_destroy(c->resultset);
+    c->resultset = 0;
     c->next = client_freelist;
     client_freelist = c;
 }
@@ -640,17 +647,20 @@ static char *make_cqlquery(struct client *cl)
     char *r;
     WRBUF wrb = wrbuf_alloc();
     int status;
+    ODR odr_out = odr_createmem(ODR_ENCODE);
 
-    zquery = p_query_rpn(global_parameters.odr_out, cl->pquery);
+    zquery = p_query_rpn(odr_out, cl->pquery);
     if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery)))
     {
         yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status);
-        return 0;
+        r = 0;
     }
-    r = xstrdup(wrbuf_cstr(wrb));
-
+    else
+    {
+        r = xstrdup(wrbuf_cstr(wrb));
+    }     
     wrbuf_destroy(wrb);
-    odr_reset(global_parameters.odr_out); // releases the zquery
+    odr_destroy(odr_out);
     cql_transform_close(cqlt);
     return r;
 }
@@ -703,7 +713,7 @@ int client_parse_query(struct client *cl, const char *query)
         char *p[512];
         extract_terms(se->nmem, cn, p);
         se->relevance = relevance_create(
-            global_parameters.server->relevance_pct,
+            se->service->relevance_pct,
             se->nmem, (const char **) p,
             se->expected_maxrecs);
     }