X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclsh.c;h=e0ed1fba81e23dcdf0236ee89e8f471f66ae9501;hb=53fc6ff5ab7aaf73cdf33a77ca11b2fbabf185d6;hp=1b01bb8a14b763587267427a3589665e14de1dbd;hpb=33a6eab614ca84eef817f675843e6de820d13708;p=yaz-moved-to-github.git

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 1b01bb8..e0ed1fb 100644
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -45,7 +45,13 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.7  2000-10-17 19:50:28  adam
+ * Revision 1.9  2001-05-16 07:30:16  adam
+ * Minor cosmetic changes that makes checker gcc happier.
+ *
+ * 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 +113,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 +183,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);
@@ -188,13 +221,13 @@ int main (int argc, char **argv)
 		if (rpn && i == 0)
 		{
 		    ccl_pr_tree (rpn, stdout);
-		    putchar ('\n');
+		    printf ("\n");
 		}
             }
             if (rpn)
                 ccl_rpn_delete(rpn);
         }
     }
-    putchar ('\n');
+    printf ("\n");
     return 0;
 }