X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=c238f0a9f31074da10e394cc06520e46bb3b7d9d;hb=6f67e37390eee5bb4df6a456de88045ef810406d;hp=964a3cb3af2c59cc4b923d66288e8423d0778642;hpb=8a78bbf3382e2061c68c866a37904e8e14770cf8;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 964a3cb..c238f0a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2010 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
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
-
+#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,14 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
 #include <signal.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include <yaz/marcdisp.h>
@@ -57,21 +50,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/querytowrbuf.h>
 #include <yaz/oid_db.h>
 #include <yaz/diagbib1.h>
+#include <yaz/snprintf.h>
+#include <yaz/rpn2cql.h>
 
 #define USE_TIMING 0
 #if USE_TIMING
 #include <yaz/timing.h>
 #endif
 
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#include "pazpar2.h"
-
+#include "ppmutex.h"
+#include "session.h"
+#include "parameters.h"
 #include "client.h"
 #include "connection.h"
 #include "settings.h"
+#include "relevance.h"
+#include "incref.h"
+
+/* client counting (1) , disable client counting (0) */
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_clients = 0;
+
+static void client_use(int delta)
+{
+    if (!g_mutex)
+        yaz_mutex_create(&g_mutex);
+    yaz_mutex_enter(g_mutex);
+    no_clients += delta;
+    yaz_mutex_leave(g_mutex);
+    yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
+}
+#else
+#define client_use(x)
+#endif
 
 /** \brief Represents client state for a connection to one search target */
 struct client {
@@ -79,14 +91,17 @@ struct client {
     struct connection *connection;
     struct session *session;
     char *pquery; // Current search
-    int hits;
-    int records;
-    int setno;
-    int requestid;            // ID of current outstanding request
+    char *cqlquery; // used for SRU targets only
+    Odr_int hits;
+    int record_offset;
+    int maxrecs;
+    int startrecs;
     int diagnostic;
     enum client_state state;
     struct show_raw *show_raw;
-    struct client *next;     // next client in session or next in free list
+    ZOOM_resultset resultset;
+    YAZ_MUTEX mutex;
+    int ref_count;
 };
 
 struct show_raw {
@@ -103,20 +118,13 @@ struct show_raw {
 
 static const char *client_states[] = {
     "Client_Connecting",
-    "Client_Connected",
     "Client_Idle",
-    "Client_Initializing",
-    "Client_Searching",
-    "Client_Presenting",
+    "Client_Working",
     "Client_Error",
     "Client_Failed",
-    "Client_Disconnected",
-    "Client_Stopped",
-    "Client_Continue"
+    "Client_Disconnected"
 };
 
-static struct client *client_freelist = 0;
-
 const char *client_get_state_str(struct client *cl)
 {
     return client_states[cl->state];
@@ -130,25 +138,20 @@ enum client_state client_get_state(struct client *cl)
 void client_set_state(struct client *cl, enum client_state st)
 {
     cl->state = st;
-    if (cl->session)
+    /* no need to check for all client being non-active if this one
+       already is. Note that session_active_clients also LOCKS session */
+#if 0
+    if (!client_is_active(cl) && cl->session)
     {
         int no_active = session_active_clients(cl->session);
         if (no_active == 0)
             session_alert_watch(cl->session, SESSION_WATCH_SHOW);
     }
+#endif
 }
 
 static void client_show_raw_error(struct client *cl, const char *addinfo);
 
-// Close connection and set state to error
-void client_fatal(struct client *cl)
-{
-    //client_show_raw_error(cl, "client connection failure");
-    yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
-    connection_destroy(cl->connection);
-    client_set_state(cl, Client_Error);
-}
-
 struct connection *client_get_connection(struct client *cl)
 {
     return cl->connection;
@@ -169,9 +172,44 @@ const char *client_get_pquery(struct client *cl)
     return cl->pquery;
 }
 
-void client_set_requestid(struct client *cl, int id)
+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(
+    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)
 {
-    cl->requestid = id;
+    ZOOM_record rec = 0;
+    char type[80];
+    const char *buf;
+    int len;
+
+    if (!resultset)
+    {
+        error_handler(data, "no resultset");
+        return;
+    }
+    rec = ZOOM_resultset_record(resultset, position-1);
+    if (!rec)
+    {
+        error_handler(data, "no record");
+        return;
+    }
+    if (binary)
+        strcpy(type, "raw");
+    else
+        nativesyntax_to_type(sdb, type, rec);
+    buf = ZOOM_record_get(rec, type, &len);
+    if (!buf)
+    {
+        error_handler(data, "no record");
+        return;
+    }
+    record_handler(data, buf, len);
 }
 
 
@@ -181,47 +219,65 @@ int client_show_raw_begin(struct client *cl, int position,
                           void (*error_handler)(void *data, const char *addinfo),
                           void (*record_handler)(void *data, const char *buf,
                                                  size_t sz),
-                          void **data2,
                           int binary)
 {
-    struct show_raw *rr, **rrp;
-    if (!cl->connection)
-    {   /* the client has no connection */
-        return -1;
-    }
-    rr = xmalloc(sizeof(*rr));
-    *data2 = rr;
-    rr->position = position;
-    rr->active = 0;
-    rr->data = data;
-    rr->error_handler = error_handler;
-    rr->record_handler = record_handler;
-    rr->binary = binary;
-    if (syntax)
-        rr->syntax = xstrdup(syntax);
+    if (syntax == 0 && esn == 0)
+        client_show_immediate(cl->resultset, client_get_database(cl),
+                              position, data,
+                              error_handler, record_handler,
+                              binary);
     else
-        rr->syntax = 0;
-    if (esn)
-        rr->esn = xstrdup(esn);
-    else
-        rr->esn = 0;
-    rr->next = 0;
-    
-    for (rrp = &cl->show_raw; *rrp; rrp = &(*rrp)->next)
-        ;
-    *rrp = rr;
-    
-    if (cl->state == Client_Failed)
-    {
-        client_show_raw_error(cl, "client failed");
-    }
-    else if (cl->state == Client_Disconnected)
     {
-        client_show_raw_error(cl, "client disconnected");
+        struct show_raw *rr, **rrp;
+
+        if (!cl->connection)
+            return -1;
+    
+
+        rr = xmalloc(sizeof(*rr));
+        rr->position = position;
+        rr->active = 0;
+        rr->data = data;
+        rr->error_handler = error_handler;
+        rr->record_handler = record_handler;
+        rr->binary = binary;
+        if (syntax)
+            rr->syntax = xstrdup(syntax);
+        else
+            rr->syntax = 0;
+        if (esn)
+            rr->esn = xstrdup(esn);
+        else
+            rr->esn = 0;
+        rr->next = 0;
+        
+        for (rrp = &cl->show_raw; *rrp; rrp = &(*rrp)->next)
+            ;
+        *rrp = rr;
+        
+        if (cl->state == Client_Failed)
+        {
+            client_show_raw_error(cl, "client failed");
+        }
+        else if (cl->state == Client_Disconnected)
+        {
+            client_show_raw_error(cl, "client disconnected");
+        }
+        else
+        {
+            client_send_raw_present(cl);
+        }
     }
     return 0;
 }
 
+static void client_show_raw_delete(struct show_raw *r)
+{
+    xfree(r->syntax);
+    xfree(r->esn);
+    xfree(r);
+}
+
 void client_show_raw_remove(struct client *cl, void *data)
 {
     struct show_raw *rr = data;
@@ -231,7 +287,7 @@ void client_show_raw_remove(struct client *cl, void *data)
     if (*rrp)
     {
         *rrp = rr->next;
-        xfree(rr);
+        client_show_raw_delete(rr);
     }
 }
 
@@ -240,7 +296,7 @@ void client_show_raw_dequeue(struct client *cl)
     struct show_raw *rr = cl->show_raw;
 
     cl->show_raw = rr->next;
-    xfree(rr);
+    client_show_raw_delete(rr);
 }
 
 static void client_show_raw_error(struct client *cl, const char *addinfo)
@@ -252,20 +308,11 @@ static void client_show_raw_error(struct client *cl, const char *addinfo)
     }
 }
 
-static void client_show_raw_cancel(struct client *cl)
-{
-    while (cl->show_raw)
-    {
-        cl->show_raw->error_handler(cl->show_raw->data, "cancel");
-        client_show_raw_dequeue(cl);
-    }
-}
-
-void client_send_raw_present(struct client *cl)
+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;
@@ -287,95 +334,118 @@ void client_send_raw_present(struct client *cl)
         elements = cl->show_raw->esn;
     else
         elements = session_setting_oneval(sdb, PZ_ELEMENTS);
-    ZOOM_resultset_option_set(set, "elementSetName", elements);
+    if (elements && *elements)
+        ZOOM_resultset_option_set(set, "elementSetName", elements);
 
-    ZOOM_resultset_records(set, 0, offset, 1);
+    ZOOM_resultset_records(set, 0, offset-1, 1);
     cl->show_raw->active = 1;
-}
 
-#ifdef RETIRED
+    connection_continue(co);
+}
 
-static void ingest_raw_records(struct client *cl, Z_Records *r)
+static int nativesyntax_to_type(struct session_database *sdb, char *type,
+                                ZOOM_record rec)
 {
-    Z_NamePlusRecordList *rlist;
-    Z_NamePlusRecord *npr;
-    xmlDoc *doc;
-    xmlChar *buf_out;
-    int len_out;
-    if (r->which != Z_Records_DBOSD)
-    {
-        client_show_raw_error(cl, "non-surrogate diagnostics");
-        return;
-    }
+    const char *s = session_setting_oneval(sdb, PZ_NATIVESYNTAX);
 
-    rlist = r->u.databaseOrSurDiagnostics;
-    if (rlist->num_records != 1 || !rlist->records || !rlist->records[0])
-    {
-        client_show_raw_error(cl, "no records");
-        return;
-    }
-    npr = rlist->records[0];
-    if (npr->which != Z_NamePlusRecord_databaseRecord)
+    if (s && *s)
     {
-        client_show_raw_error(cl, "surrogate diagnostic");
-        return;
-    }
-
-    if (cl->show_raw && cl->show_raw->binary)
-    {
-        Z_External *rec = npr->u.databaseRecord;
-        if (rec->which == Z_External_octet)
+        if (!strncmp(s, "iso2709", 7))
+        {
+            const char *cp = strchr(s, ';');
+            yaz_snprintf(type, 80, "xml; charset=%s", cp ? cp+1 : "marc-8s");
+        }
+        else if (!strncmp(s, "xml", 3))
+        {
+            strcpy(type, "xml");
+        }
+        else if (!strncmp(s, "txml", 4))
         {
-            cl->show_raw->record_handler(cl->show_raw->data,
-                                         (const char *)
-                                         rec->u.octet_aligned->buf,
-                                         rec->u.octet_aligned->len);
-            client_show_raw_dequeue(cl);
+            const char *cp = strchr(s, ';');
+            yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s");
         }
         else
-            client_show_raw_error(cl, "no records");
+            return -1;
+        return 0;
     }
-
-    doc = record_to_xml(client_get_database(cl), npr->u.databaseRecord);
-    if (!doc)
+    else  /* attempt to deduce structure */
     {
-        client_show_raw_error(cl, "unable to convert record to xml");
-        return;
+        const char *syntax = ZOOM_record_get(rec, "syntax", NULL);
+        if (syntax)
+        {
+            if (!strcmp(syntax, "XML"))
+            {
+                strcpy(type, "xml");
+                return 0;
+            }
+            else if (!strcmp(syntax, "TXML"))
+                {
+                    strcpy(type, "txml");
+                    return 0;
+                }
+            else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21"))
+            {
+                strcpy(type, "xml; charset=marc8-s");
+                return 0;
+            }
+            else return -1;
+        }
+        else return -1;
     }
+}
 
-    xmlDocDumpMemory(doc, &buf_out, &len_out);
-    xmlFreeDoc(doc);
+static void ingest_raw_record(struct client *cl, ZOOM_record rec)
+{
+    const char *buf;
+    int len;
+    char type[80];
 
-    if (cl->show_raw)
+    if (cl->show_raw->binary)
+        strcpy(type, "raw");
+    else
     {
-        cl->show_raw->record_handler(cl->show_raw->data,
-                                     (const char *) buf_out, len_out);
-        client_show_raw_dequeue(cl);
+        struct session_database *sdb = client_get_database(cl);
+        nativesyntax_to_type(sdb, type, rec);
     }
-    xmlFree(buf_out);
-}
 
-#endif // RETIRED show raw
+    buf = ZOOM_record_get(rec, type, &len);
+    cl->show_raw->record_handler(cl->show_raw->data,  buf, len);
+    client_show_raw_dequeue(cl);
+}
 
 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);
-    const char *error, *addinfo;
-
+    ZOOM_resultset resultset = cl->resultset;
+    const char *error, *addinfo = 0;
+    
     if (ZOOM_connection_error(link, &error, &addinfo))
     {
         cl->hits = 0;
-        cl->state = Client_Error;
+        client_set_state(cl, Client_Error);
         yaz_log(YLOG_WARN, "Search error %s (%s): %s",
-            error, addinfo, client_get_url(cl));
+                error, addinfo, client_get_url(cl));
     }
     else
     {
+        cl->record_offset = cl->startrecs;
         cl->hits = ZOOM_resultset_size(resultset);
-        se->total_hits += cl->hits;
+        if (se)
+            se->total_hits += cl->hits;
+    }
+}
+
+void client_got_records(struct client *cl)
+{
+    struct session *se = cl->session;
+    if (se)
+    {
+        client_unlock(cl);
+        session_alert_watch(se, SESSION_WATCH_SHOW);
+        session_alert_watch(se, SESSION_WATCH_RECORD);
+        client_lock(cl);
     }
 }
 
@@ -383,150 +453,79 @@ 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))
     {
-        cl->state = Client_Error;
+        client_set_state(cl, Client_Error);
         yaz_log(YLOG_WARN, "Search error %s (%s): %s",
             error, addinfo, client_get_url(cl));
     }
     else
     {
-        ZOOM_record rec;
-        int offset = cl->records;
+        ZOOM_record rec = 0;
         const char *msg, *addinfo;
         
-        if ((rec = ZOOM_resultset_record(resultset, offset)))
+        if (cl->show_raw && cl->show_raw->active)
         {
-            yaz_log(YLOG_LOG, "Record with offset %d", offset);
-            cl->records++;
-            if (ZOOM_record_error(rec, &msg, &addinfo, 0))
-                yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)",
-                        error, addinfo, client_get_url(cl), cl->records);
+            if ((rec = ZOOM_resultset_record(resultset,
+                                             cl->show_raw->position-1)))
+            {
+                cl->show_raw->active = 0;
+                ingest_raw_record(cl, rec);
+            }
             else
             {
-                struct session_database *sdb = client_get_database(cl);
-                const char *xmlrec;
-                char type[128] = "xml";
-                const char *nativesyntax =
-                            session_setting_oneval(sdb, PZ_NATIVESYNTAX);
-                char *cset;
-
-                if (*nativesyntax && (cset = strchr(nativesyntax, ';')))
-                    sprintf(type, "xml; charset=%s", cset + 1);
-
-                if ((xmlrec = ZOOM_record_get(rec, type, NULL)))
+                yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
+                        cl->show_raw->position-1);
+            }
+        }
+        else
+        {
+            int offset = cl->record_offset;
+            if ((rec = ZOOM_resultset_record(resultset, offset)))
+            {
+                cl->record_offset++;
+                if (cl->session == 0)
+                    ;
+                else if (ZOOM_record_error(rec, &msg, &addinfo, 0))
+                {
+                    yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)",
+                            msg, addinfo, client_get_url(cl),
+                            cl->record_offset);
+                }
+                else
                 {
-                    if (ingest_record(cl, xmlrec, cl->records))
+                    struct session_database *sdb = client_get_database(cl);
+                    NMEM nmem = nmem_create();
+                    const char *xmlrec;
+                    char type[80];
+
+                    if (nativesyntax_to_type(sdb, type, rec))
+                        yaz_log(YLOG_WARN, "Failed to determine record type");
+                    xmlrec = ZOOM_record_get(rec, type, NULL);
+                    if (!xmlrec)
+                        yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s",
+                                client_get_url(cl));
+                    else
                     {
-                        session_alert_watch(cl->session, SESSION_WATCH_SHOW);
-                        session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+                        if (ingest_record(cl, xmlrec, cl->record_offset, nmem))
+                            yaz_log(YLOG_WARN, "Failed to ingest from %s",
+                                    client_get_url(cl));
                     }
-                    else
-                        yaz_log(YLOG_WARN, "Failed to ingest");
+                    nmem_destroy(nmem);
                 }
-                else
-                    yaz_log(YLOG_WARN, "Failed to extract ZOOM record");
-
+            }
+            else
+            {
+                yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
+                        offset);
             }
         }
-        else
-            yaz_log(YLOG_WARN, "Expected record, but got NULL");
-    }
-}
-
-#ifdef RETIRED
-
-void client_present_response(struct client *cl, Z_APDU *a)
-{
-    Z_PresentResponse *r = a->u.presentResponse;
-    Z_Records *recs = r->records;
-        
-    if (recs && recs->which == Z_Records_NSD)
-    {
-        WRBUF w = wrbuf_alloc();
-        
-        Z_DiagRec dr, *dr_p = &dr;
-        dr.which = Z_DiagRec_defaultFormat;
-        dr.u.defaultFormat = recs->u.nonSurrogateDiagnostic;
-        
-        wrbuf_printf(w, "Present response NSD %s: ",
-                     cl->database->database->url);
-        
-        cl->diagnostic = diag_to_wrbuf(&dr_p, 1, w);
-        
-        yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w));
-        
-        cl->state = Client_Error;
-        wrbuf_destroy(w);
-
-        client_show_raw_error(cl, "non surrogate diagnostics");
-    }
-    else if (recs && recs->which == Z_Records_multipleNSD)
-    {
-        WRBUF w = wrbuf_alloc();
-        
-        wrbuf_printf(w, "Present response multipleNSD %s: ",
-                     cl->database->database->url);
-        cl->diagnostic = 
-            diag_to_wrbuf(recs->u.multipleNonSurDiagnostics->diagRecs,
-                          recs->u.multipleNonSurDiagnostics->num_diagRecs,
-                          w);
-        yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w));
-        cl->state = Client_Error;
-        wrbuf_destroy(w);
-    }
-    else if (recs && !*r->presentStatus && cl->state != Client_Error)
-    {
-        yaz_log(YLOG_DEBUG, "Good Present response %s",
-                cl->database->database->url);
-
-        // we can mix show raw and normal show ..
-        if (cl->show_raw && cl->show_raw->active)
-        {
-            cl->show_raw->active = 0; // no longer active
-            ingest_raw_records(cl, recs);
-        }
-        else
-            ingest_records(cl, recs);
-        cl->state = Client_Continue;
-    }
-    else if (*r->presentStatus) 
-    {
-        yaz_log(YLOG_WARN, "Bad Present response %s",
-                cl->database->database->url);
-        cl->state = Client_Error;
-        client_show_raw_error(cl, "bad present response");
     }
 }
 
-void client_close_response(struct client *cl, Z_APDU *a)
-{
-    struct connection *co = cl->connection;
-    /* Z_Close *r = a->u.close; */
-
-    yaz_log(YLOG_WARN, "Close response %s", cl->database->database->url);
-
-    cl->state = Client_Failed;
-    connection_destroy(co);
-}
-
-#endif // RETIRED show raw
-
-#ifdef RETIRED
-int client_is_our_response(struct client *cl)
-{
-    struct session *se = client_get_session(cl);
-
-    if (cl && (cl->requestid == se->requestid || 
-               cl->state == Client_Initializing))
-        return 1;
-    return 0;
-}
-#endif
-
 void client_start_search(struct client *cl)
 {
     struct session_database *sdb = client_get_database(cl);
@@ -539,12 +538,16 @@ void client_start_search(struct client *cl)
     const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS);
     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);
+    char maxrecs_str[24], startrecs_str[24];
 
     assert(link);
 
     cl->hits = -1;
-    cl->records = 0;
+    cl->record_offset = 0;
     cl->diagnostic = 0;
+    client_set_state(cl, Client_Working);
 
     if (*opt_piggyback)
         ZOOM_connection_option_set(link, "piggyback", opt_piggyback);
@@ -552,77 +555,136 @@ void client_start_search(struct client *cl)
         ZOOM_connection_option_set(link, "piggyback", "1");
     if (*opt_queryenc)
         ZOOM_connection_option_set(link, "rpnCharset", opt_queryenc);
-    if (*opt_elements)
+    if (*opt_sru && *opt_elements)
+        ZOOM_connection_option_set(link, "schema", opt_elements);
+    else if (*opt_elements)
         ZOOM_connection_option_set(link, "elementSetName", opt_elements);
     if (*opt_requestsyn)
         ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn);
-    if (*opt_maxrecs)
-        ZOOM_connection_option_set(link, "count", opt_maxrecs);
-    else
+
+    if (!*opt_maxrecs)
     {
-        char n[128];
-        sprintf(n, "%d", global_parameters.toget);
-        ZOOM_connection_option_set(link, "count", n);
+        sprintf(maxrecs_str, "%d", cl->maxrecs);
+        opt_maxrecs = maxrecs_str;
     }
-    if (!databaseName || !*databaseName)
-        databaseName = "Default";
-    ZOOM_connection_option_set(link, "databaseName", databaseName);
+    ZOOM_connection_option_set(link, "count", opt_maxrecs);
 
-    ZOOM_connection_option_set(link, "presentChunk", "20");
 
-    rs = ZOOM_connection_search_pqf(link, cl->pquery);
-    connection_set_resultset(co, rs);
-}
+    if (atoi(opt_maxrecs) > 20)
+        ZOOM_connection_option_set(link, "presentChunk", "20");
+    else
+        ZOOM_connection_option_set(link, "presentChunk", opt_maxrecs);
 
-struct client *client_create(void)
-{
-    struct client *r;
-    if (client_freelist)
+    sprintf(startrecs_str, "%d", cl->startrecs);
+    ZOOM_connection_option_set(link, "start", startrecs_str);
+
+    if (databaseName)
+        ZOOM_connection_option_set(link, "databaseName", databaseName);
+
+    if (cl->cqlquery)
     {
-        r = client_freelist;
-        client_freelist = client_freelist->next;
+        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);
     }
     else
-        r = xmalloc(sizeof(struct client));
+    {
+        yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
+        rs = ZOOM_connection_search_pqf(link, cl->pquery);
+    }
+    ZOOM_resultset_destroy(cl->resultset);
+    cl->resultset = rs;
+    connection_continue(co);
+}
+
+struct client *client_create(void)
+{
+    struct client *r = xmalloc(sizeof(*r));
+    r->maxrecs = 100;
+    r->startrecs = 0;
     r->pquery = 0;
+    r->cqlquery = 0;
     r->database = 0;
     r->connection = 0;
     r->session = 0;
     r->hits = 0;
-    r->records = 0;
-    r->setno = 0;
-    r->requestid = -1;
+    r->record_offset = 0;
     r->diagnostic = 0;
     r->state = Client_Disconnected;
     r->show_raw = 0;
-    r->next = 0;
+    r->resultset = 0;
+    r->mutex = 0;
+    pazpar2_mutex_create(&r->mutex, "client");
+
+    r->ref_count = 1;
+    client_use(1);
+    
     return r;
 }
 
-void client_destroy(struct client *c)
+void client_lock(struct client *c)
 {
-    struct session *se = c->session;
-    if (c == se->clients)
-        se->clients = c->next;
-    else
+    yaz_mutex_enter(c->mutex);
+}
+
+void client_unlock(struct client *c)
+{
+    yaz_mutex_leave(c->mutex);
+}
+
+void client_incref(struct client *c)
+{
+    pazpar2_incref(&c->ref_count, c->mutex);
+    yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d",
+            c, client_get_url(c), c->ref_count);
+}
+
+int client_destroy(struct client *c)
+{
+    if (c)
     {
-        struct client *cc;
-        for (cc = se->clients; cc && cc->next != c; cc = cc->next)
-            ;
-        if (cc)
-            cc->next = c->next;
+        yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d",
+                c, client_get_url(c), c->ref_count);
+        if (!pazpar2_decref(&c->ref_count, c->mutex))
+        {
+            xfree(c->pquery);
+            c->pquery = 0;
+            xfree(c->cqlquery);
+            c->cqlquery = 0;
+            assert(!c->connection);
+            assert(!c->resultset);
+            
+            yaz_mutex_destroy(&c->mutex);
+            xfree(c);
+            client_use(-1);
+            return 1;
+        }
     }
-    xfree(c->pquery);
-
-    if (c->connection)
-        connection_release(c->connection);
-    c->next = client_freelist;
-    client_freelist = c;
+    return 0;
 }
 
 void client_set_connection(struct client *cl, struct connection *con)
 {
-    cl->connection = con;
+    if (cl->resultset)
+    {
+        ZOOM_resultset_destroy(cl->resultset);
+        cl->resultset = 0;
+    }
+    if (con)
+    {
+        assert(cl->connection == 0);
+        cl->connection = con;
+        client_incref(cl);
+    }
+    else
+    {
+        cl->connection = con;
+        client_destroy(cl);
+    }
 }
 
 void client_disconnect(struct client *cl)
@@ -666,13 +728,44 @@ static CCL_bibset prepare_cclmap(struct client *cl)
     return res;
 }
 
+// returns a xmalloced CQL query corresponding to the pquery in client
+static char *make_cqlquery(struct client *cl)
+{
+    cql_transform_t cqlt = cql_transform_create();
+    Z_RPNQuery *zquery;
+    char *r;
+    WRBUF wrb = wrbuf_alloc();
+    int status;
+    ODR odr_out = odr_createmem(ODR_ENCODE);
+
+    zquery = p_query_rpn(odr_out, cl->pquery);
+    yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
+    if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery)))
+    {
+        yaz_log(YLOG_WARN, "Failed to generate CQL query, code=%d", status);
+        r = 0;
+    }
+    else
+    {
+        r = xstrdup(wrbuf_cstr(wrb));
+    }     
+    wrbuf_destroy(wrb);
+    odr_destroy(odr_out);
+    cql_transform_close(cqlt);
+    return r;
+}
+
 // Parse the query given the settings specific to this client
 int client_parse_query(struct client *cl, const char *query)
 {
     struct session *se = client_get_session(cl);
+    struct session_database *sdb = client_get_database(cl);
     struct ccl_rpn_node *cn;
     int cerror, cpos;
     CCL_bibset ccl_map = prepare_cclmap(cl);
+    const char *sru = session_setting_oneval(sdb, PZ_SRU);
+    const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
+    const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME);
 
     if (!ccl_map)
         return -1;
@@ -681,25 +774,58 @@ int client_parse_query(struct client *cl, const char *query)
     ccl_qual_rm(&ccl_map);
     if (!cn)
     {
-        cl->state = Client_Error;
-        yaz_log(YLOG_WARN, "Failed to parse query for %s",
-                         client_get_database(cl)->database->url);
+        client_set_state(cl, Client_Error);
+        yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s",
+                query,
+                client_get_database(cl)->database->url);
         return -1;
     }
     wrbuf_rewind(se->wrbuf);
-    ccl_pquery(se->wrbuf, cn);
+    if (*pqf_prefix)
+    {
+        wrbuf_puts(se->wrbuf, pqf_prefix);
+        wrbuf_puts(se->wrbuf, " ");
+    }
+    if (!pqf_strftime || !*pqf_strftime)
+        ccl_pquery(se->wrbuf, cn);
+    else
+    {
+        time_t cur_time = time(0);
+        struct tm *tm =  localtime(&cur_time);
+        char tmp_str[300];
+        const char *cp = tmp_str;
+
+        /* see man strftime(3) for things .. In particular %% gets converted
+         to %.. And That's our original query .. */
+        strftime(tmp_str, sizeof(tmp_str)-1, pqf_strftime, tm);
+        for (; *cp; cp++)
+        {
+            if (cp[0] == '%')
+                ccl_pquery(se->wrbuf, cn);
+            else
+                wrbuf_putc(se->wrbuf, cp[0]);
+        }
+    }
     xfree(cl->pquery);
     cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf));
 
+    xfree(cl->cqlquery);
+    if (*sru)
+    {
+        if (!(cl->cqlquery = make_cqlquery(cl)))
+            return -1;
+    }
+    else
+        cl->cqlquery = 0;
+
     if (!se->relevance)
     {
         // Initialize relevance structure with query terms
         char *p[512];
         extract_terms(se->nmem, cn, p);
         se->relevance = relevance_create(
-            global_parameters.server->relevance_pct,
-            se->nmem, (const char **) p,
-            se->expected_maxrecs);
+            se->service->relevance_pct,
+            se->nmem, (const char **) p);
     }
 
     ccl_rpn_delete(cn);
@@ -709,35 +835,29 @@ int client_parse_query(struct client *cl, const char *query)
 void client_set_session(struct client *cl, struct session *se)
 {
     cl->session = se;
-    cl->next = se->clients;
-    se->clients = cl;
 }
 
 int client_is_active(struct client *cl)
 {
-    if (cl->connection && (cl->state == Client_Continue ||
-                           cl->state == Client_Connecting ||
+    if (cl->connection && (cl->state == Client_Connecting ||
                            cl->state == Client_Working))
         return 1;
     return 0;
 }
 
-struct client *client_next_in_session(struct client *cl)
+Odr_int client_get_hits(struct client *cl)
 {
-    if (cl)
-        return cl->next;
-    return 0;
-
+    return cl->hits;
 }
 
-int client_get_hits(struct client *cl)
+int client_get_num_records(struct client *cl)
 {
-    return cl->hits;
+    return cl->record_offset;
 }
 
-int client_get_num_records(struct client *cl)
+void client_set_diagnostic(struct client *cl, int diagnostic)
 {
-    return cl->records;
+    cl->diagnostic = diagnostic;
 }
 
 int client_get_diagnostic(struct client *cl)
@@ -757,13 +877,28 @@ struct host *client_get_host(struct client *cl)
 
 const char *client_get_url(struct client *cl)
 {
-    return client_get_database(cl)->database->url;
+    if (cl->database)
+        return client_get_database(cl)->database->url;
+    else
+        return "NOURL";
+}
+
+void client_set_maxrecs(struct client *cl, int v)
+{
+    cl->maxrecs = v;
+}
+
+void client_set_startrecs(struct client *cl, int v)
+{
+    cl->startrecs = v;
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+