X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclqfile.c;h=f8b2438f711cf545daa16729bf5758d65fd417a7;hb=33a6eab614ca84eef817f675843e6de820d13708;hp=e8063ea68a2676fdf96a4201a38afab85592bbc7;hpb=3888e88cde70f36851544ab7acc04e0943470ec6;p=yaz-moved-to-github.git

diff --git a/ccl/cclqfile.c b/ccl/cclqfile.c
index e8063ea..f8b2438 100644
--- a/ccl/cclqfile.c
+++ b/ccl/cclqfile.c
@@ -45,7 +45,21 @@
  * Europagate, 1995
  *
  * $Log: cclqfile.c,v $
- * Revision 1.1  1996-10-11 15:00:25  adam
+ * Revision 1.5  2000-10-17 19:50:28  adam
+ * Implemented and-list and or-list for CCL module.
+ *
+ * Revision 1.4  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.3  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.2  1997/04/30 08:52:06  quinn
+ * Null
+ *
+ * Revision 1.1  1996/10/11  15:00:25  adam
  * CCL parser from Europagate Email gateway 1.0.
  *
  * Revision 1.3  1995/05/16  09:39:26  adam
@@ -63,10 +77,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <string.h>
 
-#include <ccl.h>
+#include <yaz/ccl.h>
 
 void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)
 {
@@ -117,6 +130,10 @@ void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)
                 type = CCL_BIB1_STR;
                 if (!ccl_stricmp (qual_value, "pw"))
                     value = CCL_BIB1_STR_WP;
+                if (!ccl_stricmp (qual_value, "al"))
+                    value = CCL_BIB1_STR_AND_LIST;
+                if (!ccl_stricmp (qual_value, "ol"))
+                    value = CCL_BIB1_STR_OR_LIST;
                 break;                
             case 't':
             case 'T':
@@ -133,7 +150,7 @@ void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)
             case 'c':
             case 'C':
                 type = CCL_BIB1_COM;
-                break;                
+                break;
             default:
                 type = atoi (qual_type);
             }