Implemented and-list and or-list for CCL module.

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

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 1e12be6..1b01bb8 100644 (file)
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -45,7 +45,21 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.3  1997-04-30 08:52:07  quinn
+ * 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
+ * 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
@@ -90,13 +104,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
-#include <ccl.h>
+#include <yaz/ccl.h>
 
 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;
@@ -111,9 +130,6 @@ int main (int argc, char **argv)
         {
             switch (argv[0][1])
             {
-            case 'c':
-                ccl_case_sensitive = 0;
-                break;
             case 'd':
                 debug = 1;
                 break;
@@ -141,9 +157,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
@@ -155,23 +169,30 @@ int main (int argc, char **argv)
     while (1)
     {
         char buf[80];
-        int error, pos;
+        int i, error, pos;
         struct ccl_rpn_node *rpn;
 
        printf ("CCLSH>"); fflush (stdout);
        if (!fgets (buf, 79, stdin))
            break;
-       rpn = ccl_find_str (bibset, buf, &error, &pos);
-        if (error)
+        for (i = 0; i<1; i++)
         {
-            printf ("%*s^ - ", 6+pos, " ");
-            printf ("%s\n", ccl_err_msg (error));
-        }
-        else
-        {
-            assert (rpn);
-            ccl_pr_tree (rpn, stdout);
-            putchar ('\n');
+           rpn = ccl_find_str (bibset, buf, &error, &pos);
+            if (error)
+            {
+                printf ("%*s^ - ", 6+pos, " ");
+                printf ("%s\n", ccl_err_msg (error));
+            }
+            else
+            {
+               if (rpn && i == 0)
+               {
+                   ccl_pr_tree (rpn, stdout);
+                   putchar ('\n');
+               }
+            }
+            if (rpn)
+                ccl_rpn_delete(rpn);
         }
     }
     putchar ('\n');