X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=1016778a17eac4819891f8c74a549ee02b7ec8e8;hb=c066a043f79860daf37234db3509156a3fc9205f;hp=421cb16a473a85a4a183d2aa320ffcc220a22eb1;hpb=b5bc2a31ad5125dc6d3ed1b6e626f0b9d22618bb;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 421cb16..1016778 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,31 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.69  1998-08-19 16:10:06  adam
+ * Revision 1.76  1999-03-11 11:12:07  adam
+ * Added GNU readline support. HTML display in client.
+ *
+ * Revision 1.75  1999/02/01 15:37:32  adam
+ * Fixed minor bug introduced by previous commit.
+ *
+ * Revision 1.74  1999/02/01 15:35:21  adam
+ * Added XML display.
+ *
+ * Revision 1.73  1998/10/20 13:55:43  quinn
+ * Fixed Scan bug in asn and client
+ *
+ * Revision 1.72  1998/10/20 13:23:15  quinn
+ * changed preferred pos to 1
+ *
+ * Revision 1.71  1998/10/20 13:21:43  adam
+ * Fixed scan response handler.
+ *
+ * Revision 1.70  1998/09/22 09:40:37  adam
+ * Minor changes in sort spec.
+ *
+ * Revision 1.69  1998/08/19 16:10:06  adam
  * Changed som member names of DeleteResultSetRequest/Response.
  *
  * Revision 1.68  1998/07/20 12:37:06  adam
@@ -254,6 +275,13 @@
 #include <yaz-ccl.h>
 #endif
 
+#if HAVE_READLINE_READLINE_H
+#include <readline/readline.h>
+#endif
+#if HAVE_READLINE_HISTORY_H
+#include <readline/history.h>
+#endif
+
 #define C_PROMPT "Z> "
 
 static ODR out, in, print;              /* encoding and decoding streams */
@@ -647,10 +675,22 @@ static void display_record(Z_DatabaseRecord *p)
         printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf);
     else if (r->which == Z_External_octet && p->u.octet_aligned->len)
     {
-        const char *marc_buf = (char*)p->u.octet_aligned->buf;
-        marc_display (marc_buf, NULL);
+        const char *octet_buf = (char*)p->u.octet_aligned->buf;
+	if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
+            ent->value == VAL_HTML)
+	{
+            int i;
+            for (i = 0; i<p->u.octet_aligned->len; i++)
+                if (octet_buf[i] > 126 || octet_buf[i] < 7)
+                    printf ("<%02X>", octet_buf[i]);
+                else
+                    fputc (octet_buf[i], stdout);
+	    printf ("\n");
+        }
+	else
+            marc_display (octet_buf, NULL);
         if (marcdump)
-            fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
+            fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump);
     }
     else if (ent && ent->value == VAL_SUTRS)
     {
@@ -1163,7 +1203,7 @@ static int cmd_itemorder(char *arg)
     fflush(stdout);
 
     send_itemorder(arg);
-    return(1);
+    return(2);
 }
 
 static int cmd_find(char *arg)
@@ -1514,12 +1554,12 @@ int send_sortrequest(char *arg, int newset)
 	    case 'a':
 	    case 'A':
 	    case '>':
-		*sks->sortRelation = Z_SortRelation_ascending;
+		*sks->sortRelation = Z_SortRelation_descending;
 		break;
 	    case 'd':
 	    case 'D':
 	    case '<':
-		*sks->sortRelation = Z_SortRelation_descending;
+		*sks->sortRelation = Z_SortRelation_ascending;
 		break;
 	    case 'i':
 	    case 'I':
@@ -1570,33 +1610,22 @@ void process_scanResponse(Z_ScanResponse *res)
         printf("Scan returned code %d\n", *res->scanStatus);
     if (!res->entries)
         return;
-#ifdef ASN_COMPILED
     if ((entries = res->entries->entries))
 	num_entries = res->entries->num_entries;
-#else
-    if (res->entries->which == Z_ListEntries_entries)
-    {
-        entries = res->entries->u.entries->entries;
-	num_entries = res->entries->u.entries->num_entries;
-    }
-#endif
     for (i = 0; i < num_entries; i++)
+    {
+        int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1;
 	if (entries[i]->which == Z_Entry_termInfo)
 	{
-	    printf("%c ", i + 1 == *res->positionOfTerm ? '*' : ' ');
+	    printf("%c ", i + 1 == pos_term ? '*' : ' ');
 	    display_term(entries[i]->u.termInfo);
 	}
 	else
 	    display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
-#ifdef ASN_COMPILED
+    }
     if (res->entries->nonsurrogateDiagnostics)
 	display_diagrecs (res->entries->nonsurrogateDiagnostics,
 			  res->entries->num_nonsurrogateDiagnostics);
-#else
-    if (res->entries->which == Z_ListEntries_nonSurrogateDiagnostics)
-        display_diagrecs(&res->entries->
-			 u.nonSurrogateDiagnostics->diagRecs[0], 1);
-#endif
 }
 
 void process_sortResponse(Z_SortResponse *res)
@@ -1671,7 +1700,7 @@ int cmd_scan(char *arg)
     }
     if (*arg)
     {
-        if (send_scanrequest(arg, 5, 20) < 0)
+        if (send_scanrequest(arg, 1, 20) < 0)
             return 0;
     }
     else
@@ -1870,13 +1899,25 @@ static int client(int wait)
 #else
 	if (!wait)
 #endif
-	    {
-            /* quick & dirty way to get a command line. */
-		char *end_p;
-		if (!fgets(line, 1023, stdin))
-		    break;
-		if ((end_p = strchr (line, '\n')))
-		    *end_p = '\0';
+	{
+#if HAVE_READLINE_READLINE_H
+	    char* line_in;
+	    line_in=readline(C_PROMPT);
+#if HAVE_READLINE_HISTORY_H
+	    if (*line_in)
+		add_history(line_in);
+#endif
+	    strcpy(line,line_in);
+            free (line_in);
+#else    
+	    char *end_p;
+            printf (C_PROMPT);
+	    fflush(stdout);
+	    if (!fgets(line, 1023, stdin))
+	        break;
+	    if ((end_p = strchr (line, '\n')))
+	        *end_p = '\0';
+#endif 
             if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
             {
                 strcpy(word, last_cmd);
@@ -1901,7 +1942,6 @@ static int client(int wait)
             }
             if (res < 2)
 	    {
-                printf(C_PROMPT);
 		continue;
 	    }
         }
@@ -1990,8 +2030,6 @@ static int client(int wait)
                 }
             }
             while (conn && cs_more(conn));
-	    printf(C_PROMPT);
-	    fflush(stdout);
         }
     }
     return 0;
@@ -2033,10 +2071,7 @@ int main(int argc, char **argv)
         }
     }
     if (!opened)
-    {
 	initialize ();
-        printf (C_PROMPT);
-    }
     return client (opened);
 }