X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=6b86e8c4e65c4c5a39ebe80c83fae7e81685dc3a;hb=2b17f66a25f1e9cf6e6a072736ea4459eefcc2b8;hp=be1d9b6f1363a707255c4aa008d63b7f2514e871;hpb=1c695d2fbcb0692e978237aef6cf2426678c9fdd;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index be1d9b6..6b86e8c 100644
--- 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.243 2004-05-10 10:45:28 adam Exp $
+ * $Id: client.c,v 1.247 2004-08-13 11:36:48 adam Exp $
  */
 
 #include <stdio.h>
@@ -723,6 +723,8 @@ static void print_record(const unsigned char *buf, size_t len)
     /* add newline if not already added ... */
     if (i <= 0 || buf[i-1] != '\n')
         printf ("\n");
+    if (marc_file)
+	fwrite (buf, 1, len, marc_file);
 }
 
 static void display_record(Z_External *r)
@@ -2522,12 +2524,23 @@ int cmd_cancel(const char *arg)
     }
     *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
     req->resultSetWanted = &rfalse;
+    req->referenceId = set_refid (out);
 
     send_apdu(apdu);
     printf("Sent cancel request\n");
     return 2;
 }
 
+
+int cmd_cancel_find(const char *arg) {
+    int fres;
+    fres=cmd_find(arg);
+    if( fres > 0 ) {
+	return cmd_cancel("");
+    };
+    return fres;
+}
+
 int send_scanrequest(const char *query, int pp, int num, const char *term)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
@@ -2994,7 +3007,7 @@ int cmd_source(const char* arg)
 {
     /* first should open the file and read one line at a time.. */
     FILE* includeFile;
-    char line[1024], *cp;
+    char line[102400], *cp;
 
     if(strlen(arg)<1) {
         fprintf(stderr,"Error in source command use a filename\n");
@@ -3199,7 +3212,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++;
@@ -3314,7 +3327,11 @@ static void handle_srw_record(Z_SRW_record *rec)
 	printf (" schema=%s", rec->recordSchema);
     printf ("\n");
     if (rec->recordData_buf && rec->recordData_len)
+    {
 	fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+	if (marc_file)
+	    fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file);
+    }
     else
 	printf ("No data!");
     printf("\n");
@@ -3802,6 +3819,7 @@ static struct {
     {"status", cmd_status, "",NULL,0,NULL},
     {"setnames", cmd_setnames, "",NULL,0,NULL},
     {"cancel", cmd_cancel, "",NULL,0,NULL},
+    {"cancel_find", cmd_cancel_find, "<query>",NULL,0,NULL},
     {"format", cmd_format, "<recordsyntax>",complete_format,0,NULL},
     {"schema", cmd_schema, "<schema>",complete_schema,0,NULL},
     {"elements", cmd_elements, "<elementSetName>",NULL,0,NULL},
@@ -3937,13 +3955,13 @@ int cmd_register_tab(const char* arg) {
 void process_cmd_line(char* line)
 {  
     int i,res;
-    char word[32], arg[1024];
+    char word[32], arg[10240];
     
 #if HAVE_GETTIMEOFDAY
     gettimeofday (&tv_start, 0);
 #endif
     
-    if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
+    if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0)
     {
         strcpy(word, last_cmd);
         *arg = '\0';
@@ -3958,7 +3976,7 @@ void process_cmd_line(char* line)
         char* lastnonspace=NULL;
         
         for(;*p; ++p) {
-            if(!isspace(*p)) {
+            if(!isspace(*(unsigned char *) p)) {
                 lastnonspace = p;
             }
         }
@@ -4028,9 +4046,9 @@ char ** readline_completer(char *text, int start, int end) {
         rl_attempted_completion_over = 1;
         return res;
     } else {
-        char arg[1024],word[32];
+        char arg[10240],word[32];
         int i=0 ,res;
-        if ((res = sscanf(rl_line_buffer, "%31s %1023[^;]", word, arg)) <= 0) {     
+        if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {     
             rl_attempted_completion_over = 1;
             return NULL;
         }
@@ -4076,9 +4094,9 @@ char ** readline_completer(char *text, int start, int end) {
 
 static void client(void)
 {
-    char line[1024];
+    char line[10240];
 
-    line[1023] = '\0';
+    line[10239] = '\0';
 
 #if HAVE_GETTIMEOFDAY
     gettimeofday (&tv_start, 0);
@@ -4097,7 +4115,7 @@ static void client(void)
             if (*line_in)
                 add_history(line_in);
 #endif
-            strncpy(line, line_in, 1023);
+            strncpy(line, line_in, 10239);
             free (line_in);
         }
 #endif 
@@ -4106,7 +4124,7 @@ static void client(void)
             char *end_p;
             printf (C_PROMPT);
             fflush(stdout);
-            if (!fgets(line, 1023, stdin))
+            if (!fgets(line, 10239, stdin))
                 break;
             if ((end_p = strchr (line, '\n')))
                 *end_p = '\0';