From: ja7 <ja7>
Date: Sun, 18 Mar 2001 20:45:39 +0000 (+0000)
Subject: Added readline and history support to cclsh
X-Git-Tag: YAZ.1.8~112
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=3889f5ecf0d1c952175d010d6306f72c6c138f57

Added readline and history support to cclsh
---

diff --git a/ccl/Makefile.am b/ccl/Makefile.am
index 5357a20..8843743 100644
--- a/ccl/Makefile.am
+++ b/ccl/Makefile.am
@@ -1,10 +1,10 @@
-## $Id: Makefile.am,v 1.3 2000-04-05 07:39:54 adam Exp $
+## $Id: Makefile.am,v 1.4 2001-03-18 20:45:39 ja7 Exp $
 
 noinst_LTLIBRARIES = libccl.la
 
 noinst_PROGRAMS = cclsh
 
-LIBS =
+LIBS = $(READLINE_LIBS)
 
 INCLUDES=-I$(srcdir)/../include
 
diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 1b01bb8..4d48c4f 100644
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -45,7 +45,10 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.7  2000-10-17 19:50:28  adam
+ * Revision 1.8  2001-03-18 20:45:39  ja7
+ * Added readline and history support to cclsh
+ *
+ * Revision 1.7  2000/10/17 19:50:28  adam
  * Implemented and-list and or-list for CCL module.
  *
  * Revision 1.6  2000/01/31 13:15:21  adam
@@ -107,6 +110,15 @@
 
 #include <yaz/ccl.h>
 
+
+#if HAVE_READLINE_READLINE_H
+#include <readline/readline.h> 
+#endif
+#if HAVE_READLINE_HISTORY_H
+#include <readline/history.h>
+#endif
+
+
 static int debug = 0;
 static char *prog;
 
@@ -168,13 +180,31 @@ int main (int argc, char **argv)
     }
     while (1)
     {
-        char buf[80];
+        char buf[1000];
         int i, error, pos;
         struct ccl_rpn_node *rpn;
 
+#if HAVE_READLINE_READLINE_H
+            char* line_in;
+            line_in=readline("CCLSH>");
+            if (!line_in)
+                break;
+#if HAVE_READLINE_HISTORY_H
+            if (*line_in)
+                add_history(line_in);
+#endif
+	    if(strlen(line_in) > 999) {
+	      fprintf(stderr,"Input line to long\n");
+	      break;
+	    };
+            strcpy(buf,line_in);
+            free (line_in);
+#else    
 	printf ("CCLSH>"); fflush (stdout);
-	if (!fgets (buf, 79, stdin))
+	if (!fgets (buf, 999, stdin))
 	    break;
+#endif 
+
         for (i = 0; i<1; i++)
         {
 	    rpn = ccl_find_str (bibset, buf, &error, &pos);