X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ccl%2Fcclsh.c;h=27b3464d95163e38df0adc471b929548a7845963;hp=6a69c9d640b30812db067d5e735b111f18e6c759;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=3888e88cde70f36851544ab7acc04e0943470ec6

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 6a69c9d..27b3464 100644
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -44,9 +44,9 @@
 /* CCL shell.
  * Europagate 1995
  *
- * $Log: cclsh.c,v $
- * Revision 1.2  1996-10-11 15:00:25  adam
- * CCL parser from Europagate Email gateway 1.0.
+ * $Id: cclsh.c,v 1.11 2001-11-27 22:38:50 adam Exp $
+ *
+ * Old Europagate Log:
  *
  * Revision 1.11  1995/05/16  09:39:27  adam
  * LICENSE.
@@ -82,18 +82,31 @@
  *
  * Revision 1.1  1995/02/13  12:35:21  adam
  * First version of CCL. Qualifiers aren't handled yet.
- *
  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
-#include <ccl.h>
+#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;
@@ -108,9 +121,6 @@ int main (int argc, char **argv)
         {
             switch (argv[0][1])
             {
-            case 'c':
-                ccl_case_sensitive = 0;
-                break;
             case 'd':
                 debug = 1;
                 break;
@@ -138,9 +148,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
@@ -151,26 +159,70 @@ int main (int argc, char **argv)
     }
     while (1)
     {
-        char buf[80];
-        int error, pos;
+        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;
-	rpn = ccl_find_str (bibset, buf, &error, &pos);
-        if (error)
-        {
-            printf ("%*s^ - ", 6+pos, " ");
-            printf ("%s\n", ccl_err_msg (error));
-        }
-        else
+#endif 
+
+        for (i = 0; i<1; i++)
         {
-            assert (rpn);
-            ccl_pr_tree (rpn, stdout);
-            putchar ('\n');
+	    CCL_parser cclp = ccl_parser_create ();
+	    struct ccl_token *list;
+	    
+	    cclp->bibset = bibset;
+	    
+	    list = ccl_parser_tokenize (cclp, buf);
+	    rpn = ccl_parser_find (cclp, list);
+	    
+	    error = cclp->error_code;
+	    if (error)
+		pos = cclp->error_pos - buf;
+
+            if (error)
+            {
+                printf ("%*s^ - ", 6+pos, " ");
+                printf ("%s\n", ccl_err_msg (error));
+            }
+            else
+            {
+		if (rpn && i == 0)
+		{
+		    ccl_pr_tree (rpn, stdout);
+		    printf ("\n");
+		}
+            }
+	    if (debug)
+	    {
+		struct ccl_token *lp;
+		for (lp = list; lp; lp = lp->next)
+		    printf ("%d %.*s\n", lp->kind, (int) (lp->len), lp->name);
+	    }
+	    ccl_token_del (list);
+	    ccl_parser_destroy (cclp);
+            if (rpn)
+                ccl_rpn_delete(rpn);
         }
     }
-    putchar ('\n');
+    printf ("\n");
     return 0;
 }