Minor change.

[egate.git] / ccl / cclsh.c

diff --git a/ccl/cclsh.c b/ccl/cclsh.c
index 5c3d290..e1500e7 100644 (file)
--- a/ccl/cclsh.c
+++ b/ccl/cclsh.c
@@ -2,7 +2,25 @@
  * Europagate 1995
  *
  * $Log: cclsh.c,v $
- * Revision 1.3  1995/02/14 10:25:57  adam
+ * Revision 1.9  1995/02/23 08:32:00  adam
+ * Changed header.
+ *
+ * Revision 1.7  1995/02/15  17:42:16  adam
+ * Minor changes of the api of this module. FILE* argument added
+ * to ccl_pr_tree.
+ *
+ * Revision 1.6  1995/02/14  19:55:13  adam
+ * Header files ccl.h/cclp.h are gone! They have been merged an
+ * moved to ../include/ccl.h.
+ * Node kind(s) in ccl_rpn_node have changed names.
+ *
+ * Revision 1.5  1995/02/14  16:20:57  adam
+ * Qualifiers are read from a file now.
+ *
+ * Revision 1.4  1995/02/14  14:12:42  adam
+ * Ranges for ordered qualfiers implemented (e.g. pd=1980-1990).
+ *
+ * Revision 1.3  1995/02/14  10:25:57  adam
  * The constructions 'qualifier rel term ...' implemented.
  *
  * Revision 1.2  1995/02/13  15:15:07  adam
@@ -17,35 +35,21 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "ccl.h"
+#include <ccl.h>
 
 static int debug = 0;
 static char *prog;
 
-static int ti_attr[] = {
-    CCL_BIB1_USE, 5,
-    CCL_BIB1_STR, CCL_BIB1_STR_WP
-};
-
-static int au_attr[] = {
-    CCL_BIB1_USE, 1,
-    CCL_BIB1_STR, CCL_BIB1_STR_WP
-};
-
-static int pd_attr[] = {
-    CCL_BIB1_USE, 31,
-    CCL_BIB1_REL, CCL_BIB1_REL_ORDER
-};
-
 int main (int argc, char **argv)
 {
     CCL_bibset bibset;
+    FILE *bib_inf;
+    char *bib_fname;
 
     prog = *argv;
     bibset = ccl_qual_mk ();    
     while (--argc > 0)
     {
-        ++argv;
         if (**++argv == '-')
         {
             switch (argv[0][1])
@@ -53,6 +57,29 @@ int main (int argc, char **argv)
             case 'd':
                 debug = 1;
                 break;
+            case 'b':
+                if (argv[0][2])
+                    bib_fname = argv[0]+2;
+                else if (argc > 0)
+                {
+                    --argc;
+                    bib_fname = *++argv;
+                }
+                else
+                {
+                    fprintf (stderr, "%s: missing bib filename\n", prog);
+                    exit (1);
+                }
+                bib_inf = fopen (bib_fname, "r");
+                if (!bib_inf)
+                {
+                    fprintf (stderr, "%s: cannot open %s\n", prog,
+                             bib_fname);
+                    exit (1);
+                }
+                ccl_qual_file (bibset, bib_inf);
+                fclose (bib_inf);
+                break;
             default:
                 fprintf (stderr, "%s: unknown option '%s'\n",
                     prog, *argv);
@@ -65,9 +92,6 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    ccl_qual_add (bibset, "ti", sizeof(ti_attr)/(2*sizeof(int)), ti_attr);
-    ccl_qual_add (bibset, "au", sizeof(au_attr)/(2*sizeof(int)), au_attr);
-    ccl_qual_add (bibset, "pd", sizeof(pd_attr)/(2*sizeof(int)), pd_attr);
     while (1)
     {
         char buf[80];
@@ -86,12 +110,10 @@ int main (int argc, char **argv)
         else
         {
             assert (rpn);
-            ccl_pr_tree (rpn);
+            ccl_pr_tree (rpn, stdout);
             putchar ('\n');
         }
     }
     putchar ('\n');
     return 0;
 }
-
-