X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=b4306a782075a3d092e327847d6f34ae7dd61a77;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=6d982538966515f7bafe7ff7324520cae514d48a;hpb=ed886db22397360898fa5ef764543237e99b1774;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 6d98253..b4306a7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.13 2007-07-03 11:21:48 adam Exp $
+/* $Id: client.c,v 1.20 2007-09-10 16:25:50 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -249,9 +249,13 @@ int client_show_raw_begin(struct client *cl, int position,
         cl->show_raw->esn = 0;
     
 
-    if (cl->state == Client_Failed || cl->state == Client_Disconnected)
+    if (cl->state == Client_Failed)
     {
-        client_show_raw_error(cl, "not connected");
+        client_show_raw_error(cl, "client failed");
+    }
+    else if (cl->state == Client_Disconnected)
+    {
+        client_show_raw_error(cl, "client disconnected");
     }
     else
     {
@@ -284,26 +288,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, "%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 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));
@@ -316,8 +313,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;
@@ -337,7 +365,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)
@@ -351,13 +380,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;
@@ -376,10 +403,8 @@ 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;
+    const char *piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK);
+    const char *queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING);
 
     yaz_log(YLOG_DEBUG, "Sending search to %s", sdb->database->url);
 
@@ -392,8 +417,9 @@ void client_send_search(struct client *cl)
                                    client_get_pquery(cl));
 
     // converting to target encoding
-    if ((queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING))){
-        iconv = yaz_iconv_open(queryenc, "UTF-8");
+    if (queryenc && *queryenc)
+    {
+        yaz_iconv_t iconv = yaz_iconv_open(queryenc, "UTF-8");
         if (iconv){
             yaz_query_charset_convert_rpnquery(zquery->u.type_1, 
                                                global_parameters.odr_out, 
@@ -410,16 +436,27 @@ void client_send_search(struct client *cl)
     for (ndb = 0; sdb->database->databases[ndb]; ndb++)
 	databaselist[ndb] = sdb->database->databases[ndb];
 
-    if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) 
-        || *piggyback == '1')
+    if (!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;
@@ -463,9 +500,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
 }
@@ -546,7 +581,9 @@ static void ingest_records(struct client *cl, Z_Records *r)
             continue;
     }
     if (rlist->num_records)
-        session_alert_watch(s, SESSION_WATCH_RECORDS);
+        session_alert_watch(s, SESSION_WATCH_SHOW);
+    if (rlist->num_records)
+        session_alert_watch(s, SESSION_WATCH_RECORD);
 
 #if USE_TIMING
     yaz_timing_stop(t);
@@ -707,7 +744,7 @@ int client_is_our_response(struct client *cl)
 static void init_authentication(struct client *cl, Z_InitRequest *req)
 {
     struct session_database *sdb = client_get_database(cl);
-    char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
+    const char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
 
     if (*auth)
     {
@@ -716,7 +753,7 @@ static void init_authentication(struct client *cl, Z_InitRequest *req)
         Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
                 sizeof(*idAuth));
         idAuth->which = Z_IdAuthentication_open;
-        idAuth->u.open = auth;
+        idAuth->u.open = odr_strdup(global_parameters.odr_out, auth);
         req->idAuthentication = idAuth;
         connection_set_authentication(co, nmem_strdup(se->session_nmem, auth));
     }
@@ -727,8 +764,8 @@ 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);
-
+    const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+    
     if (*zproxy)
         yaz_oi_set_string_oid(&req->otherInfo,
                               global_parameters.odr_out,
@@ -889,6 +926,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)
@@ -908,9 +946,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);