Fixes for numeric ranges (date=1980-1990).

[yaz-moved-to-github.git] / ccl / cclsh.c

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 0902419..080bc85 100644 (file)
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -45,7 +45,24 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.5  1999-12-16 23:36:19  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
+ * 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.
+ *
+ * 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
@@ -96,13 +113,27 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.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;
@@ -144,9 +175,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
@@ -157,16 +186,46 @@ 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;
+           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, " ");
@@ -174,17 +233,24 @@ int main (int argc, char **argv)
             }
             else
             {
-                assert (rpn);
-               if (i == 0)
+               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;
 }