X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclsh.c;h=4d48c4fc65a9c4a502d3d48d2130372445029730;hb=26d07328e36c41d39216d66d742d133cf7512995;hp=d2aaf46b8fe62377e5eccfbda9a13d937a9b0322;hpb=c126b2a625462f95475f00efdfdf9ce41a0e9c79;p=yaz-moved-to-github.git

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index d2aaf46..4d48c4f 100644
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -45,7 +45,13 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.6  2000-01-31 13:15:21  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
  * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
  * that some characters are not surrounded by spaces in resulting term.
  * ILL-code updates.
@@ -104,9 +110,24 @@
 
 #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;
 
+void usage(const char *prog)
+{
+    fprintf (stderr, "%s: [-d] [-b configfile]\n", prog);
+    exit (1);
+}
+
 int main (int argc, char **argv)
 {
     CCL_bibset bibset;
@@ -148,9 +169,7 @@ int main (int argc, char **argv)
                 fclose (bib_inf);
                 break;
             default:
-                fprintf (stderr, "%s: unknown option '%s'\n",
-                    prog, *argv);
-                exit (1);
+		usage(prog);
             }
         }
         else
@@ -161,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);