* Europagate 1995
*
* $Log: cclsh.c,v $
- * Revision 1.7 2000-10-17 19:50:28 adam
+ * Revision 1.10 2001-10-03 23:54:41 adam
+ * Fixes for numeric ranges (date=1980-1990).
+ *
+ * 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
#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;
}
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;
+ struct ccl_rpn_node *p;
+
+ 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, " ");
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, lp->len, lp->name);
+ }
+ ccl_token_del (list);
+ ccl_parser_destroy (cclp);
if (rpn)
ccl_rpn_delete(rpn);
}
}
- putchar ('\n');
+ printf ("\n");
return 0;
}