X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=23b59e4fb8e0edef3bb50fcf4828397f88b3a3c4;hb=2dbb55981b7169e8e3957e2ea2ea3f7fd5aea530;hp=fa55c321754f5b579513eaac835e6add0259a20b;hpb=3236c79e8d4287738236a804fe887ce4094fc9e9;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index fa55c32..23b59e4 100644
--- a/client/client.c
+++ b/client/client.c
@@ -142,11 +142,10 @@ static int auto_wait = 1;
 static Odr_bitmask z3950_options;
 static int z3950_version = 3;
 static int scan_stepSize = 0;
-static int scan_position = 1;
+static char scan_position[64];
 static int scan_size = 20;
 static char cur_host[200];
 static Odr_int last_hit_count = 0;
-
 static int pretty_xml = 0;
 
 typedef enum {
@@ -1413,7 +1412,7 @@ static char *encode_SRW_term(ODR o, const char *q)
 }
 
 
-static int send_SRW_scanRequest(const char *arg, int pos, int num)
+static int send_SRW_scanRequest(const char *arg, Odr_int *pos, int num)
 {
     Z_SRW_PDU *sr = 0;
 
@@ -1434,7 +1433,7 @@ static int send_SRW_scanRequest(const char *arg, int pos, int num)
         printf("Only CQL and PQF supported in SRW\n");
         return 0;
     }
-    sr->u.scan_request->responsePosition = odr_intdup(out, pos);
+    sr->u.scan_request->responsePosition = pos;
     sr->u.scan_request->maximumTerms = odr_intdup(out, num);
     return send_srw(sr);
 }
@@ -1661,16 +1660,16 @@ static void display_term(Z_Term *term)
     switch (term->which)
     {
     case Z_Term_general:
-        printf("    %.*s", term->u.general->len, term->u.general->buf);
+        printf("%.*s", term->u.general->len, term->u.general->buf);
         break;
     case Z_Term_characterString:
-        printf("    %s", term->u.characterString);
+        printf("%s", term->u.characterString);
         break;
     case Z_Term_numeric:
-        printf("    " ODR_INT_PRINTF, *term->u.numeric);
+        printf(ODR_INT_PRINTF, *term->u.numeric);
         break;
     case Z_Term_null:
-        printf("    null");
+        printf("null");
         break;
     }
 }
@@ -1699,17 +1698,18 @@ static void display_facet(Z_FacetField *facet)
         struct yaz_facet_attr attr_values;
         attr_values.errcode = 0;
         attr_values.limit = -1;
-        attr_values.useattr = 0;
+        attr_values.useattr = "NONE";
         attr_values.relation = "default";
 
         yaz_facet_attr_get_z_attributes(al, &attr_values);
         if (!attr_values.errcode)
         {
             int term_index;
-            printf("  %s (%d): \n", attr_values.useattr, /* attr_values.relation, attr_values.limit, */ facet->num_terms);
+            printf("  %s (%d): \n", attr_values.useattr, facet->num_terms);
             for (term_index = 0 ; term_index < facet->num_terms; term_index++)
             {
                 Z_FacetTerm *facetTerm = facet->terms[term_index];
+                printf("    ");
                 display_term(facetTerm->term);
                 printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
             }
@@ -2376,9 +2376,9 @@ static int cmd_update_common(const char *arg, int version)
 
 #if YAZ_HAVE_XML2
     if (protocol == PROTO_HTTP)
-        return send_SRW_update(action_no, recid_buf, rec_buf, rec_len);
+        return send_SRW_update(action_no, recid, rec_buf, rec_len);
 #endif
-    return send_Z3950_update(version, action_no, recid_buf, rec_buf, rec_len);
+    return send_Z3950_update(version, action_no, recid, rec_buf, rec_len);
 }
 
 #if YAZ_HAVE_XML2
@@ -3320,13 +3320,14 @@ static int cmd_cancel_find(const char *arg)
 }
 
 static int send_Z3950_scanrequest(const char *set,  const char *query,
-                                  Odr_int pp, Odr_int num, const char *term)
+                                  Odr_int *pos, Odr_int num, const char *term)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
     Z_ScanRequest *req = apdu->u.scanRequest;
 
     if (only_z3950())
         return 0;
+    printf("query: %s\n", query);
     if (queryType == QueryType_CCL2RPN)
     {
         int error, pos;
@@ -3396,7 +3397,7 @@ static int send_Z3950_scanrequest(const char *set,  const char *query,
     req->num_databaseNames = num_databaseNames;
     req->databaseNames = databaseNames;
     req->numberOfTermsRequested = &num;
-    req->preferredPositionInResponse = &pp;
+    req->preferredPositionInResponse = pos;
     req->stepSize = odr_intdup(out, scan_stepSize);
 
     if (set)
@@ -3571,9 +3572,17 @@ static int cmd_scanstep(const char *arg)
 
 static int cmd_scanpos(const char *arg)
 {
-    int r = sscanf(arg, "%d", &scan_position);
-    if (r == 0)
-        scan_position = 1;
+    if (!strcmp(arg, "none"))
+        strcpy(scan_position, "none");
+    else
+    {
+        int dummy;
+        int r = sscanf(arg, "%d", &dummy);
+        if (r == 1 && strlen(arg) < sizeof(scan_position)-1)
+            strcpy(scan_position, arg);
+        else
+            printf("specify number of none for scanpos\n");
+    }
     return 0;
 }
 
@@ -3587,6 +3596,28 @@ static int cmd_scansize(const char *arg)
 
 static int cmd_scan_common(const char *set, const char *arg)
 {
+    Odr_int pos, *pos_p = 0;
+    const char *scan_term = 0;
+    const char *scan_query = 0;
+
+    if (!*arg)
+    {
+        pos = 1;
+        pos_p = &pos;
+        scan_query = last_scan_query;
+        scan_term = last_scan_line;
+    }
+    else 
+    {
+        strcpy(last_scan_query, arg);
+        scan_query = arg;
+        if (strcmp(scan_position, "none"))
+        {
+            pos = odr_atoi(scan_position);
+            pos_p = &pos;
+        }
+    }
+
     if (protocol == PROTO_HTTP)
     {
 #if YAZ_HAVE_XML2
@@ -3594,16 +3625,8 @@ static int cmd_scan_common(const char *set, const char *arg)
             session_connect(cur_host);
         if (!conn)
             return 0;
-        if (*arg)
-        {
-            if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0)
-                return 0;
-        }
-        else
-        {
-            if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0)
-                return 0;
-        }
+        if (send_SRW_scanRequest(scan_query, pos_p, scan_size) < 0)
+            return 0;
         return 2;
 #else
         return 0;
@@ -3624,19 +3647,9 @@ static int cmd_scan_common(const char *set, const char *arg)
             printf("Target doesn't support scan\n");
             return 0;
         }
-        if (*arg)
-        {
-            strcpy(last_scan_query, arg);
-            if (send_Z3950_scanrequest(set, arg,
-                                       scan_position, scan_size, 0) < 0)
-                return 0;
-        }
-        else
-        {
-            if (send_Z3950_scanrequest(set, last_scan_query,
-                                      1, scan_size, last_scan_line) < 0)
-                return 0;
-        }
+        if (send_Z3950_scanrequest(set, scan_query, pos_p,
+                                   scan_size, scan_term) < 0)
+            return 0;
         return 2;
     }
 }
@@ -4262,6 +4275,8 @@ static void initialize(const char *rc_file)
         exit(1);
     }
     
+    strcpy(scan_position, "1");
+
     setvbuf(stdout, 0, _IONBF, 0);
     if (apdu_file)
         odr_setprint(print, apdu_file);
@@ -4350,6 +4365,8 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
         printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
     if (res->facetList)
         display_facets(res->facetList);
+    if (res->suggestions)
+        printf("Suggestions:\n%s\n", res->suggestions);
     for (i = 0; i<res->num_records; i++)
         handle_srw_record(res->records + i);
 }