X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient.c;h=c97847428ed9542aacc58caef350d523da4f787c;hb=043c2f97c9b6fa76fbe50c27c4d145a0f16e9e82;hp=c4147fa78f57e39a2ea7ecaea9d5072069517543;hpb=f333d5d11a8ed50f3765456bf5883a7203ca4f43;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index c4147fa..c978474 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,7 +1,5 @@
-/* $Id: client.c,v 1.8 2007-06-06 11:56:35 marc Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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
@@ -14,22 +12,34 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 /** \file client.c
     \brief Z39.50 client 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#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>
@@ -45,20 +55,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/nmem.h>
 #include <yaz/query-charset.h>
 #include <yaz/querytowrbuf.h>
-#if YAZ_VERSIONL >= 0x020163
 #include <yaz/oid_db.h>
-#endif
-
-#if HAVE_CONFIG_H
-#include "cconfig.h"
-#endif
+#include <yaz/diagbib1.h>
+#include <yaz/snprintf.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"
 
@@ -78,9 +86,22 @@ struct client {
     int requestid;            // ID of current outstanding request
     int diagnostic;
     enum client_state state;
+    struct show_raw *show_raw;
     struct client *next;     // next client in session or next in free list
 };
 
+struct show_raw {
+    int active; // whether this request has been sent to the server
+    int position;
+    int binary;
+    char *syntax;
+    char *esn;
+    void (*error_handler)(void *data, const char *addinfo);
+    void (*record_handler)(void *data, const char *buf, size_t sz);
+    void *data;
+    struct show_raw *next;
+};
+
 static const char *client_states[] = {
     "Client_Connecting",
     "Client_Connected",
@@ -91,17 +112,12 @@ static const char *client_states[] = {
     "Client_Error",
     "Client_Failed",
     "Client_Disconnected",
-    "Client_Stopped"
+    "Client_Stopped",
+    "Client_Continue"
 };
 
 static struct client *client_freelist = 0;
 
-static int send_apdu(struct client *c, Z_APDU *a)
-{
-    return connection_send_apdu(client_get_connection(c), a);
-}
-
-
 const char *client_get_state_str(struct client *cl)
 {
     return client_states[cl->state];
@@ -115,14 +131,23 @@ 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)
+    {
+        int no_active = session_active_clients(cl->session);
+        if (no_active == 0)
+            session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+    }
 }
 
+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);
-    cl->state = Client_Error;
+    client_set_state(cl, Client_Error);
 }
 
 struct connection *client_get_connection(struct client *cl)
@@ -150,268 +175,377 @@ void client_set_requestid(struct client *cl, int id)
     cl->requestid = id;
 }
 
-void client_send_present(struct client *cl)
-{
-    struct session_database *sdb = client_get_database(cl);
-    Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest);
-    int toget;
-    int start = cl->records + 1;
-    char *recsyn;
 
-    toget = global_parameters.chunk;
-    if (toget > global_parameters.toget - cl->records)
-        toget = global_parameters.toget - cl->records;
-    if (toget > cl->hits - cl->records)
-	toget = cl->hits - cl->records;
+static void client_send_raw_present(struct client *cl);
+
+int client_show_raw_begin(struct client *cl, int position,
+                          const char *syntax, const char *esn,
+                          void *data,
+                          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);
+    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;
+}
 
-    yaz_log(YLOG_DEBUG, "Trying to present %d records\n", toget);
+void client_show_raw_remove(struct client *cl, void *data)
+{
+    struct show_raw *rr = data;
+    struct show_raw **rrp = &cl->show_raw;
+    while (*rrp != rr)
+        rrp = &(*rrp)->next;
+    if (*rrp)
+    {
+        *rrp = rr->next;
+        xfree(rr);
+    }
+}
 
-    a->u.presentRequest->resultSetStartPoint = &start;
-    a->u.presentRequest->numberOfRecordsRequested = &toget;
+void client_show_raw_dequeue(struct client *cl)
+{
+    struct show_raw *rr = cl->show_raw;
 
-    a->u.presentRequest->resultSetId = "Default";
+    cl->show_raw = rr->next;
+    xfree(rr);
+}
 
-    if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
+static void client_show_raw_error(struct client *cl, const char *addinfo)
+{
+    while (cl->show_raw)
     {
-#if YAZ_VERSIONL >= 0x020163
-        a->u.presentRequest->preferredRecordSyntax =
-            yaz_string_to_oid_odr(yaz_oid_std(),
-                                  CLASS_RECSYN, recsyn,
-                                  global_parameters.odr_out);
-#else
-        a->u.presentRequest->preferredRecordSyntax =
-            yaz_str_to_z3950oid(global_parameters.odr_out,
-                                CLASS_RECSYN, recsyn);
-#endif
+        cl->show_raw->error_handler(cl->show_raw->data, addinfo);
+        client_show_raw_dequeue(cl);
     }
-
-    if (send_apdu(cl, a) >= 0)
-	cl->state = Client_Presenting;
-    else
-        cl->state = Client_Error;
-    odr_reset(global_parameters.odr_out);
 }
 
+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_search(struct client *cl)
+static void client_send_raw_present(struct client *cl)
 {
-    struct session *se = client_get_session(cl);
     struct session_database *sdb = client_get_database(cl);
-    Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_searchRequest);
-    int ndb;
-    char **databaselist;
-    Z_Query *zquery;
-    int ssub = 0, lslb = 100000, mspn = 10;
-    char *recsyn = 0;
-    char *piggyback = 0;
-    char *queryenc = 0;
-    yaz_iconv_t iconv = 0;
-
-    yaz_log(YLOG_DEBUG, "Sending search to %s", sdb->database->url);
-
-    // constructing RPN query
-    a->u.searchRequest->query = zquery = odr_malloc(global_parameters.odr_out,
-                                                    sizeof(Z_Query));
-    zquery->which = Z_Query_type_1;
-    zquery->u.type_1 = p_query_rpn(global_parameters.odr_out, 
-                                   client_get_pquery(cl));
-
-    // converting to target encoding
-    if ((queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING))){
-        iconv = yaz_iconv_open(queryenc, "UTF-8");
-        if (iconv){
-            yaz_query_charset_convert_rpnquery(zquery->u.type_1, 
-                                               global_parameters.odr_out, 
-                                               iconv);
-            yaz_iconv_close(iconv);
-        } else
-            yaz_log(YLOG_WARN, "Query encoding failed %s %s", 
-                    client_get_database(cl)->database->url, queryenc);
-    }
+    struct connection *co = client_get_connection(cl);
+    ZOOM_resultset set = connection_get_resultset(co);
 
-    for (ndb = 0; sdb->database->databases[ndb]; ndb++)
-	;
-    databaselist = odr_malloc(global_parameters.odr_out, sizeof(char*) * ndb);
-    for (ndb = 0; sdb->database->databases[ndb]; ndb++)
-	databaselist[ndb] = sdb->database->databases[ndb];
+    int offset = cl->show_raw->position;
+    const char *syntax = 0;
+    const char *elements = 0;
 
-    if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) 
-        || *piggyback == '1')
-    {
-        if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
-        {
-#if YAZ_VERSIONL >= 0x020163
-            a->u.searchRequest->preferredRecordSyntax =
-                yaz_string_to_oid_odr(yaz_oid_std(),
-                                      CLASS_RECSYN, recsyn,
-                                      global_parameters.odr_out);
-#else
-            a->u.searchRequest->preferredRecordSyntax =
-                yaz_str_to_z3950oid(global_parameters.odr_out,
-                                    CLASS_RECSYN, recsyn);
-#endif
-        }
-        a->u.searchRequest->smallSetUpperBound = &ssub;
-        a->u.searchRequest->largeSetLowerBound = &lslb;
-        a->u.searchRequest->mediumSetPresentNumber = &mspn;
-    }
-    a->u.searchRequest->resultSetName = "Default";
-    a->u.searchRequest->databaseNames = databaselist;
-    a->u.searchRequest->num_databaseNames = ndb;
+    assert(cl->show_raw);
+    assert(set);
 
-    
-    {  //scope for sending and logging queries 
-        WRBUF wbquery = wrbuf_alloc();
-        yaz_query_to_wrbuf(wbquery, a->u.searchRequest->query);
+    yaz_log(YLOG_DEBUG, "%s: trying to present %d record(s) from %d",
+            client_get_url(cl), 1, offset);
 
+    if (cl->show_raw->syntax)
+        syntax = cl->show_raw->syntax;
+    else
+        syntax = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
+    ZOOM_resultset_option_set(set, "preferredRecordSyntax", syntax);
 
-        if (send_apdu(cl, a) >= 0)
-        {
-            client_set_state(cl, Client_Searching);
-            client_set_requestid(cl, se->requestid);
-            yaz_log(YLOG_LOG, "SearchRequest %s %s %s", 
-                    client_get_database(cl)->database->url,
-                    queryenc ? queryenc : "UTF-8",
-                    wrbuf_cstr(wbquery));
-        }
-        else {
-            client_set_state(cl, Client_Error);
-            yaz_log(YLOG_WARN, "Failed SearchRequest %s  %s %s", 
-                    client_get_database(cl)->database->url, 
-                    queryenc ? queryenc : "UTF-8",
-                    wrbuf_cstr(wbquery));
-        }
-        
-        wrbuf_destroy(wbquery);
-    }    
+    if (cl->show_raw->esn)
+        elements = cl->show_raw->esn;
+    else
+        elements = session_setting_oneval(sdb, PZ_ELEMENTS);
+    if (elements && *elements)
+        ZOOM_resultset_option_set(set, "elementSetName", elements);
+
+    ZOOM_resultset_records(set, 0, offset-1, 1);
+    cl->show_raw->active = 1;
 
-    odr_reset(global_parameters.odr_out);
+    connection_continue(co);
 }
 
-void client_init_response(struct client *cl, Z_APDU *a)
+static void ingest_raw_record(struct client *cl, ZOOM_record rec)
 {
-    Z_InitResponse *r = a->u.initResponse;
+    const char *buf;
+    int len;
+    char type[50];
 
-    yaz_log(YLOG_DEBUG, "Init response %s", cl->database->database->url);
-
-    if (*r->result)
+    if (cl->show_raw->binary)
+        strcpy(type, "raw");
+    else
     {
-	cl->state = Client_Idle;
+        struct session_database *sdb = client_get_database(cl);
+        const char *cset;
+
+        const char *nativesyntax = session_setting_oneval(sdb, PZ_NATIVESYNTAX);
+        if (*nativesyntax && (cset = strchr(nativesyntax, ';')))
+            yaz_snprintf(type, sizeof(type)-1, "xml; charset=%s", cset);
+        else
+            strcpy(type, "xml");
     }
-    else
-        cl->state = Client_Failed; // FIXME need to do something to the connection
+
+    buf = ZOOM_record_get(rec, type, &len);
+    cl->show_raw->record_handler(cl->show_raw->data,  buf, len);
+    client_show_raw_dequeue(cl);
 }
 
+#ifdef RETIRED
 
-static void ingest_records(struct client *cl, Z_Records *r)
+static void ingest_raw_records(struct client *cl, Z_Records *r)
 {
-#if USE_TIMING
-    yaz_timing_t t = yaz_timing_create();
-#endif
-    struct record *rec;
-    struct session *s = client_get_session(cl);
     Z_NamePlusRecordList *rlist;
-    int i;
-
+    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;
+    }
+
     rlist = r->u.databaseOrSurDiagnostics;
-    for (i = 0; i < rlist->num_records; i++)
+    if (rlist->num_records != 1 || !rlist->records || !rlist->records[0])
     {
-        Z_NamePlusRecord *npr = rlist->records[i];
+        client_show_raw_error(cl, "no records");
+        return;
+    }
+    npr = rlist->records[0];
+    if (npr->which != Z_NamePlusRecord_databaseRecord)
+    {
+        client_show_raw_error(cl, "surrogate diagnostic");
+        return;
+    }
 
-        cl->records++;
-        if (npr->which != Z_NamePlusRecord_databaseRecord)
+    if (cl->show_raw && cl->show_raw->binary)
+    {
+        Z_External *rec = npr->u.databaseRecord;
+        if (rec->which == Z_External_octet)
         {
-            yaz_log(YLOG_WARN, 
-                    "Unexpected record type, probably diagnostic %s",
-                    cl->database->database->url);
-            continue;
+            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);
         }
+        else
+            client_show_raw_error(cl, "no records");
+    }
 
-        rec = ingest_record(cl, npr->u.databaseRecord, cl->records);
-        if (!rec)
-            continue;
+    doc = record_to_xml(client_get_database(cl), npr->u.databaseRecord);
+    if (!doc)
+    {
+        client_show_raw_error(cl, "unable to convert record to xml");
+        return;
     }
-    if (rlist->num_records)
-        session_alert_watch(s, SESSION_WATCH_RECORDS);
 
-#if USE_TIMING
-    yaz_timing_stop(t);
-    yaz_log(YLOG_LOG, "ingest_records %6.5f %3.2f %3.2f", 
-            yaz_timing_get_real(t), yaz_timing_get_user(t),
-            yaz_timing_get_sys(t));
-    yaz_timing_destroy(&t);
-#endif
+    xmlDocDumpMemory(doc, &buf_out, &len_out);
+    xmlFreeDoc(doc);
+
+    if (cl->show_raw)
+    {
+        cl->show_raw->record_handler(cl->show_raw->data,
+                                     (const char *) buf_out, len_out);
+        client_show_raw_dequeue(cl);
+    }
+    xmlFree(buf_out);
 }
 
+#endif // RETIRED show raw
 
-void client_search_response(struct client *cl, Z_APDU *a)
+void client_search_response(struct client *cl)
 {
+    struct connection *co = cl->connection;
     struct session *se = cl->session;
-    Z_SearchResponse *r = a->u.searchResponse;
-
-    yaz_log(YLOG_DEBUG, "Search response %s (status=%d)", 
-            cl->database->database->url, *r->searchStatus);
+    ZOOM_connection link = connection_get_link(co);
+    ZOOM_resultset resultset = connection_get_resultset(co);
+    const char *error, *addinfo;
 
-    if (*r->searchStatus)
+    if (ZOOM_connection_error(link, &error, &addinfo))
     {
-	cl->hits = *r->resultCount;
-        se->total_hits += cl->hits;
-        if (r->presentStatus && !*r->presentStatus && r->records)
-        {
-            yaz_log(YLOG_DEBUG, "Records in search response %s", 
-                    cl->database->database->url);
-            ingest_records(cl, r->records);
-        }
-        cl->state = Client_Idle;
+        cl->hits = 0;
+        cl->state = Client_Error;
+        yaz_log(YLOG_WARN, "Search error %s (%s): %s",
+            error, addinfo, client_get_url(cl));
     }
     else
-    {          /*"FAILED"*/
-	cl->hits = 0;
+    {
+        cl->hits = ZOOM_resultset_size(resultset);
+        se->total_hits += cl->hits;
+    }
+}
+
+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);
+    const char *error, *addinfo;
+
+    yaz_log(YLOG_LOG, "client_record_response");
+    if (ZOOM_connection_error(link, &error, &addinfo))
+    {
         cl->state = Client_Error;
-        if (r->records) {
-            Z_Records *recs = r->records;
-            if (recs->which == Z_Records_NSD)
+        yaz_log(YLOG_WARN, "Search error %s (%s): %s",
+            error, addinfo, client_get_url(cl));
+    }
+    else
+    {
+        ZOOM_record rec;
+        int offset = cl->records;
+        const char *msg, *addinfo;
+
+        if ((rec = ZOOM_resultset_record(resultset, offset)))
+        {
+            yaz_log(YLOG_LOG, "Record with offset %d", offset);
+
+            yaz_log(YLOG_LOG, "show_raw=%p show_raw->active=%d",
+                    cl->show_raw, cl->show_raw ? cl->show_raw->active : 0);
+            if (cl->show_raw && cl->show_raw->active)
             {
-                yaz_log(YLOG_WARN,  
-                    "Search response: Non-surrogate diagnostic %s (%d)", 
-                    cl->database->database->url, 
-                    *recs->u.nonSurrogateDiagnostic->condition); 
-                cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition;
-                cl->state = Client_Error;
+                cl->show_raw->active = 0;
+                ingest_raw_record(cl, rec);
+            }
+            else
+            {
+                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);
+                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)))
+                    {
+                        if (ingest_record(cl, xmlrec, cl->records))
+                        {
+                            session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+                            session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+                        }
+                        else
+                            yaz_log(YLOG_WARN, "Failed to ingest");
+                    }
+                    else
+                        yaz_log(YLOG_WARN, "Failed to extract ZOOM record");
+                }
+
             }
         }
+        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);
 
-    if (r->records) {
-        Z_Records *recs = r->records;
-        if (recs->which == Z_Records_NSD)
-        {
-            yaz_log(YLOG_WARN, "Non-surrogate diagnostic %s",
-                    cl->database->database->url);
-            cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition;
-            cl->state = Client_Error;
-        }
+        client_show_raw_error(cl, "non surrogate diagnostics");
     }
-
-    if (!*r->presentStatus && cl->state != Client_Error)
+    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);
-        ingest_records(cl, r->records);
-        cl->state = Client_Idle;
+
+        // 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");
     }
 }
 
@@ -426,6 +560,9 @@ void client_close_response(struct client *cl, Z_APDU *a)
     connection_destroy(co);
 }
 
+#endif // RETIRED show raw
+
+#ifdef RETIRED
 int client_is_our_response(struct client *cl)
 {
     struct session *se = client_get_session(cl);
@@ -435,93 +572,54 @@ int client_is_our_response(struct client *cl)
         return 1;
     return 0;
 }
+#endif
 
-// Set authentication token in init if one is set for the client
-// TODO: Extend this to handle other schemes than open (should be simple)
-static void init_authentication(struct client *cl, Z_InitRequest *req)
+void client_start_search(struct client *cl)
 {
     struct session_database *sdb = client_get_database(cl);
-    char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
-
-    if (*auth)
+    struct connection *co = client_get_connection(cl);
+    ZOOM_connection link = connection_get_link(co);
+    ZOOM_resultset rs;
+    char *databaseName = sdb->database->databases[0];
+    const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK);
+    const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING);
+    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);
+
+    assert(link);
+
+    cl->hits = -1;
+    cl->records = 0;
+    cl->diagnostic = 0;
+
+    if (*opt_piggyback)
+        ZOOM_connection_option_set(link, "piggyback", opt_piggyback);
+    else
+        ZOOM_connection_option_set(link, "piggyback", "1");
+    if (*opt_queryenc)
+        ZOOM_connection_option_set(link, "rpnCharset", opt_queryenc);
+    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
     {
-        struct connection *co = client_get_connection(cl);
-        struct session *se = client_get_session(cl);
-        Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
-                sizeof(*idAuth));
-        idAuth->which = Z_IdAuthentication_open;
-        idAuth->u.open = auth;
-        req->idAuthentication = idAuth;
-        connection_set_authentication(co, nmem_strdup(se->session_nmem, auth));
+        char n[128];
+        sprintf(n, "%d", global_parameters.toget);
+        ZOOM_connection_option_set(link, "count", n);
     }
-}
-
-static void init_zproxy(struct client *cl, Z_InitRequest *req)
-{
-    struct session_database *sdb = client_get_database(cl);
-    char *ztarget = sdb->database->url;
-    //char *ztarget = sdb->url;    
-    char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
-
-    if (*zproxy)
-#if YAZ_VERSIONL >= 0x020163
-        yaz_oi_set_string_oid(&req->otherInfo,
-                              global_parameters.odr_out,
-                              yaz_oid_userinfo_proxy,
-                              1, ztarget);
-#else
-        yaz_oi_set_string_oidval(&req->otherInfo,
-                                 global_parameters.odr_out, VAL_PROXY,
-                                 1, ztarget);
-#endif
-}
-
-
-static void client_init_request(struct client *cl)
-{
-    Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_initRequest);
-
-    a->u.initRequest->implementationId = global_parameters.implementationId;
-    a->u.initRequest->implementationName = global_parameters.implementationName;
-    a->u.initRequest->implementationVersion =
-	global_parameters.implementationVersion;
-    ODR_MASK_SET(a->u.initRequest->options, Z_Options_search);
-    ODR_MASK_SET(a->u.initRequest->options, Z_Options_present);
-    ODR_MASK_SET(a->u.initRequest->options, Z_Options_namedResultSets);
+    if (!databaseName || !*databaseName)
+        databaseName = "Default";
+    ZOOM_connection_option_set(link, "databaseName", databaseName);
 
-    ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_1);
-    ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_2);
-    ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_3);
+    ZOOM_connection_option_set(link, "presentChunk", "20");
 
-    init_authentication(cl, a->u.initRequest);
-    init_zproxy(cl, a->u.initRequest);
-
-
-
-    if (send_apdu(cl, a) >= 0)
-	client_set_state(cl, Client_Initializing);
-    else
-        client_set_state(cl, Client_Error);
-    odr_reset(global_parameters.odr_out);
-}
-
-void client_continue(struct client *cl)
-{
-    if (cl->state == Client_Connected) {
-        client_init_request(cl);
-    }
-
-    if (cl->state == Client_Idle)
-    {
-        struct session *se = client_get_session(cl);
-        if (cl->requestid != se->requestid && cl->pquery) {
-            client_send_search(cl);
-        }
-        else if (cl->hits > 0 && cl->records < global_parameters.toget &&
-            cl->records < cl->hits) {
-            client_send_present(cl);
-        }
-    }
+    rs = ZOOM_connection_search_pqf(link, cl->pquery);
+    connection_set_resultset(co, rs);
+    connection_continue(co);
 }
 
 struct client *client_create(void)
@@ -544,6 +642,7 @@ struct client *client_create(void)
     r->requestid = -1;
     r->diagnostic = 0;
     r->state = Client_Disconnected;
+    r->show_raw = 0;
     r->next = 0;
     return r;
 }
@@ -561,6 +660,8 @@ void client_destroy(struct client *c)
         if (cc)
             cc->next = c->next;
     }
+    xfree(c->pquery);
+
     if (c->connection)
         connection_release(c->connection);
     c->next = client_freelist;
@@ -575,7 +676,7 @@ void client_set_connection(struct client *cl, struct connection *con)
 void client_disconnect(struct client *cl)
 {
     if (cl->state != Client_Idle)
-        cl->state = Client_Disconnected;
+        client_set_state(cl, Client_Disconnected);
     client_set_connection(cl, 0);
 }
 
@@ -623,6 +724,7 @@ int client_parse_query(struct client *cl, const char *query)
 
     if (!ccl_map)
         return -1;
+
     cn = ccl_find_str(ccl_map, query, &cerror, &cpos);
     ccl_qual_rm(&ccl_map);
     if (!cn)
@@ -642,9 +744,10 @@ int client_parse_query(struct client *cl, const char *query)
         // Initialize relevance structure with query terms
         char *p[512];
         extract_terms(se->nmem, cn, p);
-        se->relevance = relevance_create(client_get_database(cl)->pct,
-                                         se->nmem, (const char **) p,
-                                         se->expected_maxrecs);
+        se->relevance = relevance_create(
+            global_parameters.server->relevance_pct,
+            se->nmem, (const char **) p,
+            se->expected_maxrecs);
     }
 
     ccl_rpn_delete(cn);
@@ -660,10 +763,9 @@ void client_set_session(struct client *cl, struct session *se)
 
 int client_is_active(struct client *cl)
 {
-    if (cl->connection && (cl->state == Client_Connecting ||
-                           cl->state == Client_Initializing ||
-                           cl->state == Client_Searching ||
-                           cl->state == Client_Presenting))
+    if (cl->connection && (cl->state == Client_Continue ||
+                           cl->state == Client_Connecting ||
+                           cl->state == Client_Working))
         return 1;
     return 0;
 }