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

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index d2aaf46..27b3464 100644
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -44,23 +44,9 @@
 /* CCL shell.
  * Europagate 1995
  *
- * $Log: cclsh.c,v $
- * 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.
+ * $Id: cclsh.c,v 1.11 2001-11-27 22:38:50 adam Exp $
  *
- * Revision 1.5  1999/12/16 23:36:19  adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.4  1999/03/31 11:15:37  adam
- * Fixed memory leaks in ccl_find_str and ccl_qual_rm.
- *
- * Revision 1.3  1997/04/30 08:52:07  quinn
- * Null
- *
- * Revision 1.2  1996/10/11  15:00:25  adam
- * CCL parser from Europagate Email gateway 1.0.
+ * Old Europagate Log:
  *
  * Revision 1.11  1995/05/16  09:39:27  adam
  * LICENSE.
@@ -96,7 +82,6 @@
  *
  * Revision 1.1  1995/02/13  12:35:21  adam
  * First version of CCL. Qualifiers aren't handled yet.
- *
  */
 
 #include <stdio.h>
@@ -104,9 +89,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 +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
@@ -161,16 +159,45 @@ 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);
+	    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, " ");
@@ -181,13 +208,21 @@ int main (int argc, char **argv)
 		if (rpn && i == 0)
 		{
 		    ccl_pr_tree (rpn, stdout);
-		    putchar ('\n');
+		    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;
 }