X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=ff9cc0280617026672e29d10e7be1c88b96ea8aa;hb=d0fc1a702b50978db129c169c8c309af42f0746b;hp=9a8bf1d138f439d6d8c0ee72bbd4d3e64e172dc4;hpb=56776a949ab948cf9e79310b4f775ef2a8f3dcf3;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 9a8bf1d..ff9cc02 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.12 2007-06-19 12:25:29 adam Exp $
+/* $Id: client.c,v 1.15 2007-07-05 18:46:03 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -108,6 +108,18 @@ static struct client *client_freelist = 0;
 
 static int send_apdu(struct client *c, Z_APDU *a)
 {
+    struct session_database *sdb = client_get_database(c);
+    const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+    if (apdulog && *apdulog && *apdulog != '0')
+    {
+        ODR p = odr_createmem(ODR_PRINT);
+        yaz_log(YLOG_LOG, "send APDU %s", client_get_url(c));
+
+        odr_setprint(p, yaz_log_file());
+        z_APDU(p, &a, 0, 0);
+        odr_setprint(p, stderr);
+        odr_destroy(p);
+    }
     return connection_send_apdu(client_get_connection(c), a);
 }
 
@@ -235,7 +247,16 @@ int client_show_raw_begin(struct client *cl, int position,
         cl->show_raw->esn = xstrdup(esn);
     else
         cl->show_raw->esn = 0;
-    client_continue(cl);
+    
+
+    if (cl->state == Client_Failed || cl->state == Client_Disconnected)
+    {
+        client_show_raw_error(cl, "not connected");
+    }
+    else
+    {
+        client_continue(cl);
+    }
     return 0;
 }
 
@@ -263,26 +284,19 @@ static void client_show_raw_cancel(struct client *cl)
     }
 }
 
-void client_send_raw_present(struct client *cl)
+static void client_present_syntax(Z_APDU *a, const char *syntax)
 {
-    Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest);
-    int toget = 1;
-    int start = cl->show_raw->position;
-
-    assert(cl->show_raw);
-
-    yaz_log(YLOG_DEBUG, "Trying to present %d record(s) from %d",
-            toget, start);
-
-    a->u.presentRequest->resultSetStartPoint = &start;
-    a->u.presentRequest->numberOfRecordsRequested = &toget;
-
-    if (cl->show_raw->syntax)  // syntax is optional
+    // empty string for syntax OMITS preferredRecordSyntax (OPTIONAL)
+    if (syntax && *syntax)
         a->u.presentRequest->preferredRecordSyntax =
             yaz_string_to_oid_odr(yaz_oid_std(),
-                                  CLASS_RECSYN, cl->show_raw->syntax,
+                                  CLASS_RECSYN, syntax,
                                   global_parameters.odr_out);
-    if (cl->show_raw->esn)  // element set is optional
+}
+
+static void client_present_elements(Z_APDU *a, const char *elements)
+{
+    if (elements && *elements)  // element set is optional
     {
         Z_ElementSetNames *elementSetNames =
             odr_malloc(global_parameters.odr_out, sizeof(*elementSetNames));
@@ -295,8 +309,39 @@ void client_send_raw_present(struct client *cl)
 
         elementSetNames->which = Z_ElementSetNames_generic;
         elementSetNames->u.generic = 
-            odr_strdup(global_parameters.odr_out, cl->show_raw->esn);
+            odr_strdup(global_parameters.odr_out, elements);
     }
+}
+
+void client_send_raw_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 = 1;
+    int start = cl->show_raw->position;
+    const char *syntax = 0;
+    const char *elements = 0;
+
+    assert(cl->show_raw);
+
+    yaz_log(YLOG_DEBUG, "%s: trying to present %d record(s) from %d",
+            client_get_url(cl), toget, start);
+
+    a->u.presentRequest->resultSetStartPoint = &start;
+    a->u.presentRequest->numberOfRecordsRequested = &toget;
+
+    if (cl->show_raw->syntax)
+        syntax = cl->show_raw->syntax;
+    else
+        syntax = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
+
+    client_present_syntax(a, syntax);
+    if (cl->show_raw->esn)
+        elements = cl->show_raw->esn;
+    else
+        elements = session_setting_oneval(sdb, PZ_ELEMENTS);
+    client_present_elements(a, elements);
+
     if (send_apdu(cl, a) >= 0)
     {
         cl->show_raw->active = 1;
@@ -316,7 +361,8 @@ void client_send_present(struct client *cl)
     Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest);
     int toget;
     int start = cl->records + 1;
-    char *recsyn;
+    const char *syntax = 0;
+    const char *elements = 0;
 
     toget = global_parameters.chunk;
     if (toget > global_parameters.toget - cl->records)
@@ -330,13 +376,11 @@ void client_send_present(struct client *cl)
     a->u.presentRequest->resultSetStartPoint = &start;
     a->u.presentRequest->numberOfRecordsRequested = &toget;
 
-    if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
-    {
-        a->u.presentRequest->preferredRecordSyntax =
-            yaz_string_to_oid_odr(yaz_oid_std(),
-                                  CLASS_RECSYN, recsyn,
-                                  global_parameters.odr_out);
-    }
+    syntax = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
+    client_present_syntax(a, syntax);
+
+    elements = session_setting_oneval(sdb, PZ_ELEMENTS);
+    client_present_elements(a, elements);
 
     if (send_apdu(cl, a) >= 0)
 	cl->state = Client_Presenting;
@@ -355,7 +399,6 @@ void client_send_search(struct client *cl)
     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;
@@ -392,13 +435,25 @@ void client_send_search(struct client *cl)
     if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) 
         || *piggyback == '1')
     {
-        if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
+        const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS);
+        const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
+        if (recsyn && *recsyn)
         {
             a->u.searchRequest->preferredRecordSyntax =
                 yaz_string_to_oid_odr(yaz_oid_std(),
                                       CLASS_RECSYN, recsyn,
                                       global_parameters.odr_out);
         }
+        if (elements && *elements)
+        {
+            Z_ElementSetNames *esn =
+                odr_malloc(global_parameters.odr_out, sizeof(*esn));
+            esn->which = Z_ElementSetNames_generic;
+            esn->u.generic = odr_strdup(global_parameters.odr_out, elements);
+
+            a->u.searchRequest->smallSetElementSetNames = esn;
+            a->u.searchRequest->mediumSetElementSetNames = esn;
+        }
         a->u.searchRequest->smallSetUpperBound = &ssub;
         a->u.searchRequest->largeSetLowerBound = &lslb;
         a->u.searchRequest->mediumSetPresentNumber = &mspn;
@@ -442,9 +497,7 @@ void client_init_response(struct client *cl, Z_APDU *a)
     yaz_log(YLOG_DEBUG, "Init response %s", cl->database->database->url);
 
     if (*r->result)
-    {
 	cl->state = Client_Idle;
-    }
     else
         cl->state = Client_Failed; // FIXME need to do something to the connection
 }
@@ -747,7 +800,6 @@ 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);