Fix sample PQF

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

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index acff48f..27b3464 100644 (file)
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -1,9 +1,60 @@
+/*
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
 /* CCL shell.
  * Europagate 1995
  *
- * $Log: cclsh.c,v $
- * Revision 1.1  1995-04-10 10:28:21  quinn
- * Added copy of CCL.
+ * $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.
+ *
+ * Revision 1.10  1995/05/11  14:03:57  adam
+ * Changes in the reading of qualifier(s). New function: ccl_qual_fitem.
+ * New variable ccl_case_sensitive, which controls whether reserved
+ * words and field names are case sensitive or not.
  *
  * Revision 1.9  1995/02/23  08:32:00  adam
  * Changed header.
@@ -31,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;
@@ -84,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
@@ -97,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;
 }