Deprecated log.h and created a new ylog.h

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index f0cab9b..be42824 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.246 2004-08-11 11:44:30 adam Exp $
+ * $Id: client.c,v 1.256 2004-11-18 15:18:10 heikki Exp $
  */
 
 #include <stdio.h>
@@ -51,6 +51,7 @@
 #include <yaz/srw.h>
 #include <yaz/yaz-ccl.h>
 #include <yaz/cql.h>
+#include <yaz/ylog.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -115,7 +116,8 @@ static char *last_open_command = NULL;
 static int auto_reconnect = 0;
 static Odr_bitmask z3950_options;
 static int z3950_version = 3;
-
+static int scan_stepSize = 0;
+static int scan_position = 1;
 static char cur_host[200];
 
 typedef enum {
@@ -379,9 +381,25 @@ static int process_initResponse(Z_InitResponse *res)
                printf("Guessing visiblestring:\n");
                printf("'%s'\n", uif->u. octet_aligned->buf);
            } else if (uif->which == Z_External_single) {
-               /* Peek at any private Init-diagnostic APDUs */
                Odr_any *sat = uif->u.single_ASN1_type;
-               printf("### NAUGHTY: External is '%s'\n", sat->buf);
+               oident *oid = oid_getentbyoid(uif->direct_reference);
+               if (oid->value == VAL_OCLCUI) {
+                   Z_OCLC_UserInformation *oclc_ui;
+                   ODR decode = odr_createmem(ODR_DECODE);
+                   odr_setbuf(decode, sat->buf, sat->len, 0);
+                   if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0))
+                       printf ("Bad OCLC UserInformation:\n");
+                   else
+                       printf ("OCLC UserInformation:\n");
+                   if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
+                       printf ("Bad OCLC UserInformation spec\n");
+                   odr_destroy(decode);
+               }
+               else
+               {
+                   /* Peek at any private Init-diagnostic APDUs */
+                   printf("### NAUGHTY: External is '%.*s'\n", sat->len, sat->buf);
+               }
            }
            odr_reset (print);
        }
@@ -568,6 +586,8 @@ int session_connect(const char *arg)
         return 0;
     }
 #if HAVE_XML2
+    if (conn->protocol == PROTO_HTTP)
+       queryType = QueryType_CQL;
 #else
     if (conn->protocol == PROTO_HTTP)
     {
@@ -1243,14 +1263,31 @@ static int send_SRW_searchRequest(const char *arg)
     setno = 1;
 
     /* save this for later .. when fetching individual records */
-    srw_sr = sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
-    sr->u.request->query_type = Z_SRW_query_type_cql;
-    sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
-
+    srw_sr =  yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+    
+    /* regular request .. */
     sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
-    sr->u.request->query_type = Z_SRW_query_type_cql;
-    sr->u.request->query.cql = odr_strdup(out, arg);
 
+    switch(queryType)
+    {
+    case QueryType_CQL:
+       srw_sr->u.request->query_type = Z_SRW_query_type_cql;
+       srw_sr->u.request->query.cql = odr_strdup(srw_sr_odr_out, arg);
+
+       sr->u.request->query_type = Z_SRW_query_type_cql;
+       sr->u.request->query.cql = odr_strdup(out, arg);
+       break;
+    case QueryType_Prefix:
+       srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
+       srw_sr->u.request->query.pqf = odr_strdup(srw_sr_odr_out, arg);
+
+       sr->u.request->query_type = Z_SRW_query_type_pqf;
+       sr->u.request->query.pqf = odr_strdup(out, arg);
+       break;
+    default:
+       printf ("Only CQL and PQF supported in SRW\n");
+       return 0;
+    }
     sr->u.request->maximumRecords = odr_intdup(out, 0);
 
     if (record_schema)
@@ -2603,6 +2640,7 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
     req->databaseNames = databaseNames;
     req->numberOfTermsRequested = &num;
     req->preferredPositionInResponse = &pp;
+    req->stepSize = odr_intdup(out, scan_stepSize);
     send_apdu(apdu);
     return 2;
 }
@@ -2765,6 +2803,20 @@ int cmd_sort_newset (const char *arg)
     return cmd_sort_generic (arg, 1);
 }
 
+int cmd_scanstep(const char *arg)
+{
+    scan_stepSize = atoi(arg);
+    return 0;
+}
+
+int cmd_scanpos(const char *arg)
+{
+    int r = sscanf(arg, "%d", &scan_position);
+    if (r == 0)
+        scan_position = 1;
+    return 0;
+}
+
 int cmd_scan(const char *arg)
 {
     if (only_z3950())
@@ -2786,7 +2838,7 @@ int cmd_scan(const char *arg)
     if (*arg)
     {
         strcpy (last_scan_query, arg);
-        if (send_scanrequest(arg, 1, 20, 0) < 0)
+        if (send_scanrequest(arg, scan_position, 20, 0) < 0)
             return 0;
     }
     else
@@ -3212,7 +3264,7 @@ int cmd_register_oid(const char* args) {
     name = oid_str;
     val = 0;
     
-    while (isdigit (*name))
+    while (isdigit (*(unsigned char *) name))
     {
         val = val*10 + (*name - '0');
         name++;
@@ -3659,6 +3711,20 @@ int cmd_set_otherinfo(const char* args)
     return 0;
 }
 
+int cmd_sleep(const char* args ) 
+{
+    int sec=atoi(args);
+    if( sec > 0 ) {
+#ifdef WIN32
+       Sleep(sec*1000);
+#else
+       sleep(sec);
+#endif
+       printf("Done sleeping %d seconds\n", sec);      
+    }
+    return 1;    
+}
+
 int cmd_list_otherinfo(const char* args)
 {
     int i;        
@@ -3810,6 +3876,8 @@ static struct {
     {"base", cmd_base, "<base-name>",NULL,0,NULL},
     {"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
     {"scan", cmd_scan, "<term>",NULL,0,NULL},
+    {"scanstep", cmd_scanstep, "<size>",NULL,0,NULL},
+    {"scanpos", cmd_scanpos, "<size>",NULL,0,NULL},
     {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
     {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ...",NULL,0,NULL},
     {"authentication", cmd_authentication, "<acctstring>",NULL,0,NULL},
@@ -3843,7 +3911,8 @@ static struct {
     {"set_cclfile", cmd_set_cclfile," <filename>",NULL,1,NULL},
     {"set_cqlfile", cmd_set_cqlfile," <filename>",NULL,1,NULL},
     {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL},
-       {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+    {"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
+    {"sleep", cmd_sleep,"<seconds>",NULL,0,NULL},
     {"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
     {"push_command", cmd_push_command,"<command>",command_generator,0,NULL},
     {"register_tab", cmd_register_tab,"<commandname> <tab>",command_generator,0,NULL},
@@ -3972,11 +4041,11 @@ void process_cmd_line(char* line)
     
     /* removed tailing spaces from the arg command */
     { 
-        unsigned char* p = arg;
+        char* p = arg;
         char* lastnonspace=NULL;
         
         for(;*p; ++p) {
-            if(!isspace(*p)) {
+            if(!isspace(*(unsigned char *) p)) {
                 lastnonspace = p;
             }
         }