X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclfind.c;h=9403634d1b4816c25d0fa7fbcc0edcc2a0a07a88;hp=17d0470a38b8c8db36d65559907579c438d19457;hb=e484d47e2e06b836878786d9772d01cb764913c7;hpb=73f6b7a6b12a1e0e54c9cc360f552a56726d75fd

diff --git a/src/cclfind.c b/src/cclfind.c
index 17d0470..9403634 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -1,48 +1,8 @@
-/*
- * 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.
- *
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.
  */
-
-/** 
+/**
  * \file cclfind.c
  * \brief Implements parsing of a CCL FIND query.
  *
@@ -51,67 +11,13 @@
  * of lookahead in the handling of relational operations.. So
  * it's not really pure.
  */
-
-
-/* CCL find (to rpn conversion)
- * Europagate, 1995
- *
- * $Id: cclfind.c,v 1.14 2007-05-01 12:22:11 adam Exp $
- *
- * Old Europagate log:
- *
- * Revision 1.16  1996/01/08  08:41:13  adam
- * Removed unused function.
- *
- * Revision 1.15  1995/07/20  08:14:34  adam
- * Qualifiers were observed too often. Instead tokens are treated as
- * qualifiers only when separated by comma.
- *
- * Revision 1.14  1995/05/16  09:39:26  adam
- * LICENSE.
- *
- * Revision 1.13  1995/04/17  09:31:42  adam
- * Improved handling of qualifiers. Aliases or reserved words.
- *
- * Revision 1.12  1995/03/20  15:27:43  adam
- * Minor changes.
- *
- * Revision 1.11  1995/02/23  08:31:59  adam
- * Changed header.
- *
- * Revision 1.9  1995/02/16  13:20:06  adam
- * Spell fix.
- *
- * Revision 1.8  1995/02/14  19:59:42  adam
- * Removed a syntax error.
- *
- * Revision 1.7  1995/02/14  19:55:10  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.6  1995/02/14  16:20:55  adam
- * Qualifiers are read from a file now.
- *
- * Revision 1.5  1995/02/14  14:12:41  adam
- * Ranges for ordered qualfiers implemented (e.g. pd=1980-1990).
- *
- * Revision 1.4  1995/02/14  13:16:29  adam
- * Left and/or right truncation implemented.
- *
- * Revision 1.3  1995/02/14  10:25:56  adam
- * The constructions 'qualifier rel term ...' implemented.
- *
- * Revision 1.2  1995/02/13  15:15:07  adam
- * Added handling of qualifiers. Not finished yet.
- *
- * Revision 1.1  1995/02/13  12:35:20  adam
- * First version of CCL. Qualifiers aren't handled yet.
- *
- */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "cclp.h"
 
@@ -155,7 +61,7 @@ static int qual_val_type(ccl_qualifier_t *qa, int type, int value,
 
 /**
  * strxcat: concatenate strings.
- * n:      Null-terminated Destination string 
+ * n:      Null-terminated Destination string
  * src:    Source string to be appended (not null-terminated)
  * len:    Length of source string.
  */
@@ -194,7 +100,7 @@ struct ccl_rpn_node *ccl_rpn_node_create(enum ccl_rpn_kind kind)
     ccl_assert(p);
     p->kind = kind;
 
-    switch(kind)
+    switch (kind)
     {
     case CCL_RPN_TERM:
         p->u.t.attr_list = 0;
@@ -207,6 +113,71 @@ struct ccl_rpn_node *ccl_rpn_node_create(enum ccl_rpn_kind kind)
     return p;
 }
 
+static struct ccl_rpn_node *ccl_rpn_node_mkbool(struct ccl_rpn_node *l,
+                                                struct ccl_rpn_node *r,
+                                                enum ccl_rpn_kind op)
+{
+    if (l && r)
+    {
+        struct ccl_rpn_node *tmp = ccl_rpn_node_create(op);
+        tmp->u.p[0] = l;
+        tmp->u.p[1] = r;
+        tmp->u.p[2] = 0;
+        return tmp;
+    }
+    else if (r)
+        return r;
+    return l;
+}
+
+static struct ccl_rpn_node *ccl_rpn_dup(struct ccl_rpn_node *rpn)
+{
+    struct ccl_rpn_node *n;
+    struct ccl_rpn_attr *attr, **attrp;
+    if (!rpn)
+        return 0;
+    n = ccl_rpn_node_create(rpn->kind);
+    switch (rpn->kind)
+    {
+    case CCL_RPN_AND:
+    case CCL_RPN_OR:
+    case CCL_RPN_NOT:
+        n->u.p[0] = ccl_rpn_dup(rpn->u.p[0]);
+        n->u.p[1] = ccl_rpn_dup(rpn->u.p[1]);
+        break;
+    case CCL_RPN_TERM:
+        n->u.t.term = xstrdup(rpn->u.t.term);
+        n->u.t.qual = rpn->u.t.qual ? xstrdup(rpn->u.t.qual) : 0;
+        attrp = &n->u.t.attr_list;
+        for (attr = rpn->u.t.attr_list; attr; attr = attr->next)
+        {
+            *attrp = (struct ccl_rpn_attr *) xmalloc(sizeof(**attrp));
+            (*attrp)->kind = attr->kind;
+            (*attrp)->type = attr->type;
+            if (attr->kind == CCL_RPN_ATTR_STRING)
+                (*attrp)->value.str = xstrdup(attr->value.str);
+            else
+                (*attrp)->value.numeric = attr->value.numeric;
+            if (attr->set)
+                (*attrp)->set = xstrdup(attr->set);
+            else
+                (*attrp)->set = 0;
+            attrp = &(*attrp)->next;
+        }
+        *attrp = 0;
+        break;
+    case CCL_RPN_SET:
+        n->u.setname = xstrdup(rpn->u.setname);
+        break;
+    case CCL_RPN_PROX:
+        n->u.p[0] = ccl_rpn_dup(rpn->u.p[0]);
+        n->u.p[1] = ccl_rpn_dup(rpn->u.p[1]);
+        n->u.p[2] = ccl_rpn_dup(rpn->u.p[2]);
+        break;
+    }
+    return n;
+}
+
 /**
  * ccl_rpn_delete: Delete RPN tree.
  * rpn:   Pointer to tree.
@@ -253,7 +224,7 @@ static struct ccl_rpn_node *find_spec(CCL_parser cclp, ccl_qualifier_t *qa);
 
 static int is_term_ok(int look, int *list)
 {
-    for (;*list >= 0; list++)
+    for (; *list >= 0; list++)
         if (look == *list)
             return 1;
     return 0;
@@ -264,9 +235,7 @@ static struct ccl_rpn_node *search_terms(CCL_parser cclp, ccl_qualifier_t *qa);
 static struct ccl_rpn_attr *add_attr_node(struct ccl_rpn_node *p,
                                            const char *set, int type)
 {
-    struct ccl_rpn_attr *n;
-    
-    n = (struct ccl_rpn_attr *)xmalloc(sizeof(*n));
+    struct ccl_rpn_attr *n = (struct ccl_rpn_attr *) xmalloc(sizeof(*n));
     ccl_assert(n);
     if (set)
         n->set = xstrdup(set);
@@ -275,7 +244,6 @@ static struct ccl_rpn_attr *add_attr_node(struct ccl_rpn_node *p,
     n->type = type;
     n->next = p->u.t.attr_list;
     p->u.t.attr_list = n;
-    
     return n;
 }
 
@@ -289,9 +257,7 @@ static struct ccl_rpn_attr *add_attr_node(struct ccl_rpn_node *p,
 void ccl_add_attr_numeric(struct ccl_rpn_node *p, const char *set,
                           int type, int value)
 {
-    struct ccl_rpn_attr *n;
-
-    n = add_attr_node(p, set, type);
+    struct ccl_rpn_attr *n = add_attr_node(p, set, type);
     n->kind = CCL_RPN_ATTR_NUMERIC;
     n->value.numeric = value;
 }
@@ -299,33 +265,154 @@ void ccl_add_attr_numeric(struct ccl_rpn_node *p, const char *set,
 void ccl_add_attr_string(struct ccl_rpn_node *p, const char *set,
                          int type, char *value)
 {
-    struct ccl_rpn_attr *n;
-
-    n = add_attr_node(p, set, type);
+    struct ccl_rpn_attr *n = add_attr_node(p, set, type);
     n->kind = CCL_RPN_ATTR_STRING;
     n->value.str = xstrdup(value);
 }
 
+static size_t cmp_operator(const char **aliases, const char *input)
+{
+    for (; *aliases; aliases++)
+    {
+        const char *cp = *aliases;
+        size_t i;
+        for (i = 0; *cp && *cp == input[i]; i++, cp++)
+            ;
+        if (*cp == '\0')
+            return i;
+    }
+    return 0;
+}
 
-/**
- * search_term: Parse CCL search term. 
- * cclp:   CCL Parser
- * qa:     Qualifier attributes already applied.
- * term_list: tokens we accept as terms in context
- * multi:  whether we accept "multiple" tokens
- * return: pointer to node(s); NULL on error.
- */
-static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
-                                          ccl_qualifier_t *qa,
-                                          int *term_list, int multi)
+
+#define REGEX_CHARS "^[]{}()|.*+?!$"
+#define CCL_CHARS "#?\\"
+
+static int has_ccl_masking(const char *src_str,
+                           size_t src_len,
+                           const char **truncation_aliases,
+                           const char **mask_aliases)
 {
-    struct ccl_rpn_node *p_top = 0;
-    struct ccl_token *lookahead = cclp->look_token;
-    int and_list = 0;
-    int or_list = 0;
+    size_t j;
+    int quote_mode = 0;
+
+    for (j = 0; j < src_len; j++)
+    {
+        size_t op_size;
+        if (j > 0 && src_str[j-1] == '\\')
+            ;
+        else if (src_str[j] == '"')
+            quote_mode = !quote_mode;
+        else if (!quote_mode &&
+                 (op_size = cmp_operator(truncation_aliases,
+                                         src_str + j)))
+            return 1;
+        else if (!quote_mode &&
+                 (op_size = cmp_operator(mask_aliases,
+                                          src_str + j)))
+            return 1;
+    }
+    return 0;
+}
+
+static int append_term(CCL_parser cclp, const char *src_str, size_t src_len,
+                       char *dst_term, int regex_trunc, int z3958_trunc,
+                       const char **truncation_aliases,
+                       const char **mask_aliases,
+                       int is_first, int is_last,
+                       int *left_trunc, int *right_trunc)
+{
+    size_t j;
+    int quote_mode = 0;
+
+    for (j = 0; j < src_len; j++)
+    {
+        size_t op_size;
+        if (j > 0 && src_str[j-1] == '\\')
+        {
+            if (regex_trunc && strchr(REGEX_CHARS "\\", src_str[j]))
+                strcat(dst_term, "\\");
+            else if (z3958_trunc && strchr(CCL_CHARS "\\", src_str[j]))
+                strcat(dst_term, "\\");
+            strxcat(dst_term, src_str + j, 1);
+        }
+        else if (src_str[j] == '"')
+            quote_mode = !quote_mode;
+        else if (!quote_mode &&
+                 (op_size = cmp_operator(truncation_aliases,
+                                         src_str + j))
+            )
+        {
+            j += (op_size - 1);  /* j++ in for loop */
+            if (regex_trunc)
+                strcat(dst_term, ".*");
+            else if (z3958_trunc)
+                strcat(dst_term, "?");
+            else if (is_first && j == 0)
+                *left_trunc = 1;
+            else if (is_last && j == src_len - 1)
+                *right_trunc = 1;
+            else
+            {
+                cclp->error_code = CCL_ERR_TRUNC_NOT_EMBED;
+                return -1;
+            }
+        }
+        else if (!quote_mode &&
+                 (op_size = cmp_operator(mask_aliases, src_str + j)))
+        {
+            j += (op_size - 1);  /* j++ in for loop */
+            if (regex_trunc)
+                strcat(dst_term, ".");
+            else if (z3958_trunc)
+                strcat(dst_term, "#");
+            else
+            {
+                cclp->error_code = CCL_ERR_TRUNC_NOT_SINGLE;
+                return -1;
+            }
+        }
+        else if (src_str[j] != '\\')
+        {
+            if (regex_trunc && strchr(REGEX_CHARS, src_str[j]))
+                strcat(dst_term, "\\");
+            else if (z3958_trunc && strchr(CCL_CHARS, src_str[j]))
+                strcat(dst_term, "\\");
+            strxcat(dst_term, src_str + j, 1);
+        }
+    }
+    return 0;
+}
+
+
+static struct ccl_rpn_node *ccl_term_one_use(CCL_parser cclp,
+                                             struct ccl_token *lookahead0,
+                                             struct ccl_rpn_attr *attr_use,
+                                             ccl_qualifier_t *qa,
+                                             size_t no,
+                                             int is_phrase,
+                                             int auto_group)
+{
+    struct ccl_rpn_node *p;
+    size_t i;
+    int relation_value = -1;
+    int position_value = -1;
+    int structure_value = -1;
+    int truncation_value = -1;
+    int completeness_value = -1;
+
+    int left_trunc = 0;
+    int right_trunc = 0;
+    int regex_trunc = 0;
+    int z3958_trunc = 0;
+    int is_ccl_masked = 0;
     char *attset;
+    struct ccl_token *lookahead = lookahead0;
     const char **truncation_aliases;
     const char *t_default[2];
+    const char **mask_aliases;
+    const char *m_default[2];
+    int term_len = 0;
 
     truncation_aliases =
         ccl_qual_search_special(cclp->bibset, "truncation");
@@ -335,79 +422,43 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         t_default[0] = "?";
         t_default[1] = 0;
     }
-
-    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_AND_LIST, 0))
-        and_list = 1;
-    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_OR_LIST, 0))
-        or_list = 1;
-    while (1)
+    mask_aliases =
+        ccl_qual_search_special(cclp->bibset, "mask");
+    if (!mask_aliases)
     {
-        struct ccl_rpn_node *p;
-        size_t no, i;
-        int no_spaces = 0;
-        int left_trunc = 0;
-        int right_trunc = 0;
-        int mid_trunc = 0;
-        int relation_value = -1;
-        int position_value = -1;
-        int structure_value = -1;
-        int truncation_value = -1;
-        int completeness_value = -1;
-        int len = 0;
-        size_t max = 200;
-        if (and_list || or_list || !multi)
-            max = 1;
-        
-        /* ignore commas when dealing with and-lists .. */
-        if (and_list && lookahead && lookahead->kind == CCL_TOK_COMMA)
-        {
-            lookahead = lookahead->next;
-            ADVANCE;
-            continue;
-        }
-        /* go through each TERM token. If no truncation attribute is yet
-           met, then look for left/right truncation markers (?) and
-           set left_trunc/right_trunc/mid_trunc accordingly */
-        for (no = 0; no < max && is_term_ok(lookahead->kind, term_list); no++)
-        {
-            for (i = 0; i<lookahead->len; i++)
-                if (lookahead->name[i] == ' ')
-                    no_spaces++;
-                else if (strchr(truncation_aliases[0], lookahead->name[i]))
-                {
-                    if (no == 0 && i == 0 && lookahead->len >= 1)
-                        left_trunc = 1;
-                    else if (!is_term_ok(lookahead->next->kind, term_list) &&
-                             i == lookahead->len-1 && i >= 1)
-                        right_trunc = 1;
-                    else
-                        mid_trunc = 1;
-                }
-            len += 1+lookahead->len+lookahead->ws_prefix_len;
-            lookahead = lookahead->next;
-        }
+        mask_aliases = m_default;
+        m_default[0] = "#";
+        m_default[1] = 0;
+    }
+    for (i = 0; i < no; i++)
+    {
+        if (has_ccl_masking(lookahead->name, lookahead->len,
+                            truncation_aliases,
+                            mask_aliases))
+            is_ccl_masked = 1;
 
-        if (len == 0)
-            break;      /* no more terms . stop . */
-                
-        /* create the term node, but wait a moment before adding the term */
-        p = ccl_rpn_node_create(CCL_RPN_TERM);
-        p->u.t.attr_list = NULL;
-        p->u.t.term = NULL;
-        if (qa && qa[0])
-        {
-            const char *n = ccl_qual_get_name(qa[0]);
-            if (n)
-                p->u.t.qual = xstrdup(n);
-        }
+        term_len += 1 + lookahead->len + lookahead->ws_prefix_len;
+        lookahead = lookahead->next;
+    }
+    lookahead = lookahead0;
 
-        /* go through all attributes and add them to the attribute list */
-        for (i=0; qa && qa[i]; i++)
-        {
-            struct ccl_rpn_attr *attr;
-            
-            for (attr = ccl_qual_get_attr(qa[i]); attr; attr = attr->next)
-                switch(attr->kind)
+    p = ccl_rpn_node_create(CCL_RPN_TERM);
+    p->u.t.attr_list = NULL;
+    p->u.t.term = NULL;
+    if (qa && qa[0])
+    {
+        const char *n = ccl_qual_get_name(qa[0]);
+        if (n)
+            p->u.t.qual = xstrdup(n);
+    }
+    /* go through all attributes and add them to the attribute list */
+    for (i = 0; qa && qa[i]; i++)
+    {
+        struct ccl_rpn_attr *attr;
+        for (attr = ccl_qual_get_attr(qa[i]); attr; attr = attr->next)
+            if (attr->type != 1 || !attr_use || attr == attr_use)
+            {
+                switch (attr->kind)
                 {
                 case CCL_RPN_ATTR_STRING:
                     ccl_add_attr_string(p, attr->set, attr->type,
@@ -437,7 +488,6 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                             if (truncation_value != -1)
                                 continue;
                             truncation_value = attr->value.numeric;
-                            left_trunc = right_trunc = mid_trunc = 0;
                             break;
                         case CCL_BIB1_COM:
                             if (completeness_value != -1)
@@ -449,106 +499,272 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                                              attr->value.numeric);
                     }
                 }
-        }
-        /* len now holds the number of characters in the RPN term */
-        /* no holds the number of CCL tokens (1 or more) */
-        
-        if (structure_value == -1 && 
+            }
+    }
+    attset = 0;
+    if (structure_value == -1 && (
+            auto_group ||
             qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_WP, &attset))
-        {   /* no structure attribute met. Apply either structure attribute 
-               WORD or PHRASE depending on number of CCL tokens */
-            if (no == 1 && no_spaces == 0)
-                ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 2);
-            else
-                ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 1);
-        }
+        )
+    {
+        if (!is_phrase)
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 2);
+        else
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 1);
+    }
+    if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_REGEX,
+                      &attset))
+    {
+        if (is_ccl_masked)
+            regex_trunc = 1; /* regex trunc (102) allowed */
+    }
+    else if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_Z3958,
+                           &attset))
+    {
+        if (is_ccl_masked)
+            z3958_trunc = 1; /* Z39.58 trunc (CCL) trunc allowed */
+    }
+    /* make the RPN token */
+    p->u.t.term = (char *)xmalloc(term_len * 2 + 2);
+    ccl_assert(p->u.t.term);
+    p->u.t.term[0] = '\0';
+
+    for (i = 0; i < no; i++)
+    {
+        const char *src_str = lookahead->name;
+        size_t src_len = lookahead->len;
 
-        /* make the RPN token */
-        p->u.t.term = (char *)xmalloc(len);
-        ccl_assert(p->u.t.term);
-        p->u.t.term[0] = '\0';
-        for (i = 0; i<no; i++)
+        if (p->u.t.term[0] && lookahead->ws_prefix_len)
         {
-            const char *src_str = cclp->look_token->name;
-            size_t src_len = cclp->look_token->len;
-            
-            if (i == 0 && left_trunc)
-            {
-                src_len--;
-                src_str++;
-            }
-            if (i == no-1 && right_trunc)
-                src_len--;
-            if (p->u.t.term[0] && cclp->look_token->ws_prefix_len)
-            {
-                size_t len = strlen(p->u.t.term);
-                memcpy(p->u.t.term + len, cclp->look_token->ws_prefix_buf,
-                       cclp->look_token->ws_prefix_len);
-                p->u.t.term[len + cclp->look_token->ws_prefix_len] = '\0';
-            }
-            strxcat(p->u.t.term, src_str, src_len);
-            ADVANCE;
+            strxcat(p->u.t.term, lookahead->ws_prefix_buf,
+                    lookahead->ws_prefix_len);
         }
-
-        /* make the top node point to us.. */
-        if (p_top)
+        if (append_term(cclp, src_str, src_len, p->u.t.term, regex_trunc,
+                        z3958_trunc, truncation_aliases, mask_aliases,
+                        i == 0, i == no - 1,
+                        &left_trunc, &right_trunc))
         {
-            struct ccl_rpn_node *tmp;
-
-            if (or_list)
-                tmp = ccl_rpn_node_create(CCL_RPN_OR);
-            else if (and_list)
-                tmp = ccl_rpn_node_create(CCL_RPN_AND);
-            else
-                tmp = ccl_rpn_node_create(CCL_RPN_AND);
-            tmp->u.p[0] = p_top;
-            tmp->u.p[1] = p;
-
-            p_top = tmp;
+            ccl_rpn_delete(p);
+            return NULL;
         }
-        else
-            p_top = p;
-
-
-        if (left_trunc && right_trunc)
+        lookahead = lookahead->next;
+    }
+    if (left_trunc && right_trunc)
+    {
+        if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_BOTH,
+                           &attset))
         {
-            if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_BOTH,
-                                &attset))
-            {
-                cclp->error_code = CCL_ERR_TRUNC_NOT_BOTH;
-                ccl_rpn_delete(p);
-                return NULL;
-            }
-            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 3);
+            cclp->error_code = CCL_ERR_TRUNC_NOT_BOTH;
+            ccl_rpn_delete(p);
+            return NULL;
         }
-        else if (right_trunc)
+        ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 3);
+    }
+    else if (right_trunc)
+    {
+        if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_RIGHT,
+                           &attset))
         {
-            if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_RIGHT,
-                                 &attset))
-            {
-                cclp->error_code = CCL_ERR_TRUNC_NOT_RIGHT;
-                ccl_rpn_delete(p);
-                return NULL;
-            }
-            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 1);
+            cclp->error_code = CCL_ERR_TRUNC_NOT_RIGHT;
+            ccl_rpn_delete(p);
+            return NULL;
         }
-        else if (left_trunc)
+        ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 1);
+    }
+    else if (left_trunc)
+    {
+        if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_LEFT,
+                           &attset))
         {
-            if (!qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_LEFT,
-                                &attset))
+            cclp->error_code = CCL_ERR_TRUNC_NOT_LEFT;
+            ccl_rpn_delete(p);
+            return NULL;
+        }
+        ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 2);
+    }
+    else if (regex_trunc)
+    {
+        ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 102);
+    }
+    else if (z3958_trunc)
+    {
+        ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 104);
+    }
+    else
+    {
+        if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_NONE,
+                          &attset))
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 100);
+    }
+    return p;
+}
+
+static struct ccl_rpn_node *ccl_term_multi_use(CCL_parser cclp,
+                                               struct ccl_token *lookahead0,
+                                               ccl_qualifier_t *qa,
+                                               size_t no,
+                                               int is_phrase,
+                                               int auto_group)
+{
+    struct ccl_rpn_node *p = 0;
+    int i;
+    for (i = 0; qa && qa[i]; i++)
+    {
+        struct ccl_rpn_attr *attr;
+        for (attr = ccl_qual_get_attr(qa[i]); attr; attr = attr->next)
+            if (attr->type == 1 && i == 0)
             {
-                cclp->error_code = CCL_ERR_TRUNC_NOT_LEFT;
-                ccl_rpn_delete(p);
-                return NULL;
+                struct ccl_rpn_node *tmp2;
+                tmp2 = ccl_term_one_use(cclp, lookahead0,
+                                        attr, qa, no,
+                                        is_phrase, auto_group);
+                if (!tmp2)
+                {
+                    ccl_rpn_delete(p);
+                    return 0;
+                }
+                p = ccl_rpn_node_mkbool(p, tmp2, CCL_RPN_OR);
             }
-            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 2);
+    }
+    if (!p)
+        p = ccl_term_one_use(cclp, lookahead0,
+                             0 /* attr: no use */, qa, no,
+                             is_phrase, auto_group);
+    return p;
+}
+
+static struct ccl_rpn_node *split_recur(CCL_parser cclp, ccl_qualifier_t *qa,
+                                        struct ccl_rpn_node *parent,
+                                        struct ccl_token **ar, size_t sz)
+{
+    size_t l;
+    struct ccl_rpn_node *p_top = 0;
+    assert(sz > 0);
+    for (l = 1; l <= sz; l++)
+    {
+        struct ccl_rpn_node *p1;
+        struct ccl_rpn_node *p2 = ccl_term_multi_use(cclp, ar[0],
+                                                     qa, l,
+                                                     l > 1,
+                                                     /* auto_group */0);
+        if (!p2)
+            return 0;
+        if (parent)
+        {
+            struct ccl_rpn_node *tmp = ccl_rpn_node_create(CCL_RPN_AND);
+            tmp->u.p[0] = l > 1 ? ccl_rpn_dup(parent) : parent;
+            tmp->u.p[1] = p2;
+            p2 = tmp;
         }
+        if (sz > l)
+            p1 = split_recur(cclp, qa, p2, ar + l, sz - l);
         else
+            p1 = p2;
+        p_top = ccl_rpn_node_mkbool(p_top, p1, CCL_RPN_OR);
+    }
+    assert(p_top);
+    return p_top;
+}
+
+static struct ccl_rpn_node *search_term_split_list(CCL_parser cclp,
+                                                   ccl_qualifier_t *qa,
+                                                   int *term_list, int multi)
+{
+    struct ccl_rpn_node *p;
+    struct ccl_token **ar;
+    struct ccl_token *lookahead = cclp->look_token;
+    size_t i, sz;
+    for (sz = 0; is_term_ok(lookahead->kind, term_list); sz++)
+        lookahead = lookahead->next;
+    if (sz == 0)
+    {
+        cclp->error_code = CCL_ERR_TERM_EXPECTED;
+        return 0;
+    }
+    ar = (struct ccl_token **) xmalloc(sizeof(*lookahead) * sz);
+    lookahead = cclp->look_token;
+    for (i = 0; is_term_ok(lookahead->kind, term_list); i++)
+    {
+        ar[i] = lookahead;
+        lookahead = lookahead->next;
+    }
+    p = split_recur(cclp, qa, 0, ar, sz);
+    xfree(ar);
+    for (i = 0; i < sz; i++)
+        ADVANCE;
+    return p;
+}
+
+/**
+ * search_term: Parse CCL search term.
+ * cclp:   CCL Parser
+ * qa:     Qualifier attributes already applied.
+ * term_list: tokens we accept as terms in context
+ * multi:  whether we accept "multiple" tokens
+ * return: pointer to node(s); NULL on error.
+ */
+static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
+                                          ccl_qualifier_t *qa,
+                                          int *term_list, int multi)
+{
+    struct ccl_rpn_node *p_top = 0;
+    struct ccl_token *lookahead = cclp->look_token;
+    int and_list = 0;
+    int auto_group = 0;
+    int or_list = 0;
+
+    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_AND_LIST, 0))
+        and_list = 1;
+    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_AUTO_GROUP, 0))
+        auto_group = 1;
+    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_OR_LIST, 0))
+        or_list = 1;
+    if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_SPLIT_LIST, 0))
+    {
+        return search_term_split_list(cclp, qa, term_list, multi);
+    }
+    while (1)
+    {
+        struct ccl_rpn_node *p = 0;
+        size_t no, i;
+        int is_phrase = 0;
+        size_t max = 200;
+        if (and_list || or_list || !multi)
+            max = 1;
+
+        /* ignore commas when dealing with and-lists .. */
+        if (and_list && lookahead && lookahead->kind == CCL_TOK_COMMA)
+        {
+            lookahead = lookahead->next;
+            ADVANCE;
+            continue;
+        }
+        for (no = 0; no < max && is_term_ok(lookahead->kind, term_list); no++)
         {
-            if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_NONE,
-                               &attset))
-                ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 100);
+            int this_is_phrase = 0;
+            for (i = 0; i<lookahead->len; i++)
+                if (lookahead->name[i] == ' ')
+                    this_is_phrase = 1;
+            if (auto_group)
+            {
+                if (no > 0 && (is_phrase || is_phrase != this_is_phrase))
+                    break;
+                is_phrase = this_is_phrase;
+            }
+            else if (this_is_phrase || no > 0)
+                is_phrase = 1;
+            lookahead = lookahead->next;
         }
+
+        if (no == 0)
+            break;      /* no more terms . stop . */
+        p = ccl_term_multi_use(cclp, cclp->look_token, qa, no,
+                               is_phrase, auto_group);
+        for (i = 0; i < no; i++)
+            ADVANCE;
+        if (!p)
+            return 0;
+        p_top = ccl_rpn_node_mkbool(p_top, p, or_list ? CCL_RPN_OR : CCL_RPN_AND);
         if (!multi)
             break;
     }
@@ -563,6 +779,36 @@ static struct ccl_rpn_node *search_term(CCL_parser cclp, ccl_qualifier_t *qa)
     return search_term_x(cclp, qa, list, 0);
 }
 
+
+static struct ccl_rpn_node *search_terms2(CCL_parser cclp,
+                                          ccl_qualifier_t *qa)
+{
+    if (KIND == CCL_TOK_LP)
+    {
+        struct ccl_rpn_node *p;
+        ADVANCE;
+        if (!(p = find_spec(cclp, qa)))
+            return NULL;
+        if (KIND != CCL_TOK_RP)
+        {
+            cclp->error_code = CCL_ERR_RP_EXPECTED;
+            ccl_rpn_delete(p);
+            return NULL;
+        }
+        ADVANCE;
+        return p;
+    }
+    else
+    {
+        static int list[] = {
+            CCL_TOK_TERM, CCL_TOK_COMMA,CCL_TOK_EQ,
+            CCL_TOK_REL, CCL_TOK_SET, -1};
+
+        return search_term_x(cclp, qa, list, 1);
+    }
+}
+
+
 static
 struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
                                       ccl_qualifier_t *ap, char *attset)
@@ -602,12 +848,17 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
         if (KIND == CCL_TOK_TERM)
         {
             size_t i;
+            int quote_mode = 0;
             for (i = 0; i<cclp->look_token->len; i++)
             {
-                if (cclp->look_token->name[i] == '-')
+                if (i > 0 && cclp->look_token->name[i] == '\\')
+                    ;
+                else if (cclp->look_token->name[i] == '"')
+                    quote_mode = !quote_mode;
+                else if (cclp->look_token->name[i] == '-' && !quote_mode)
                     break;
             }
-            
+
             if (cclp->look_token->len > 1 && i == 0)
             {   /*  -xx*/
                 struct ccl_token *ntoken = ccl_token_add(cclp->look_token);
@@ -649,7 +900,7 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
                      cclp->look_token->next->kind == CCL_TOK_TERM &&
                      cclp->look_token->next->len > 1 &&
                      cclp->look_token->next->name[0] == '-')
-                     
+
             {   /* xx -yy */
                 /* we _know_ that xx does not have - in it */
                 struct ccl_token *ntoken = ccl_token_add(cclp->look_token);
@@ -659,11 +910,11 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
                 ntoken->len = 1;
 
                 (ntoken->next->name)++;        /* adjust yy */
-                (ntoken->next->len)--; 
+                (ntoken->next->len)--;
             }
         }
     }
-        
+
     if (rel == 3 &&
         KIND == CCL_TOK_TERM &&
         cclp->look_token->next && cclp->look_token->next->len == 1 &&
@@ -676,7 +927,7 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
         if (KIND == CCL_TOK_TERM)  /* = term - term  ? */
         {
             struct ccl_rpn_node *p2;
-            
+
             if (!(p2 = search_term(cclp, ap)))
             {
                 ccl_rpn_delete(p1);
@@ -705,28 +956,15 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
         ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, 2);
         return p;
     }
-    else if (KIND == CCL_TOK_LP)
-    {
-        ADVANCE;
-        if (!(p = find_spec(cclp, ap)))
-            return NULL;
-        if (KIND != CCL_TOK_RP)
-        {
-            cclp->error_code = CCL_ERR_RP_EXPECTED;
-            ccl_rpn_delete(p);
-            return NULL;
-        }
-        ADVANCE;
-        return p;
-    }
     else
     {
         if (!(p = search_terms(cclp, ap)))
             return NULL;
-        ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, rel);
+        if (rel != 3 ||
+            !qual_val_type(ap, CCL_BIB1_REL, CCL_BIB1_REL_OMIT_EQUALS, 0))
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, rel);
         return p;
     }
-    cclp->error_code = CCL_ERR_TERM_EXPECTED;
     return NULL;
 }
 
@@ -734,8 +972,7 @@ static
 struct ccl_rpn_node *qualifier_relation(CCL_parser cclp, ccl_qualifier_t *ap)
 {
     char *attset;
-    struct ccl_rpn_node *p;
-    
+
     if (qual_val_type(ap, CCL_BIB1_REL, CCL_BIB1_REL_ORDER, &attset)
         || qual_val_type(ap, CCL_BIB1_REL, CCL_BIB1_REL_PORDER, &attset))
         return qualifiers_order(cclp, ap, attset);
@@ -747,34 +984,17 @@ struct ccl_rpn_node *qualifier_relation(CCL_parser cclp, ccl_qualifier_t *ap)
         return NULL;
     }
     ADVANCE;
-    if (KIND == CCL_TOK_LP)
-    {
-        ADVANCE;
-        if (!(p = find_spec(cclp, ap)))
-        {
-            return NULL;
-        }
-        if (KIND != CCL_TOK_RP)
-        {
-            cclp->error_code = CCL_ERR_RP_EXPECTED;
-            ccl_rpn_delete(p);
-            return NULL;
-        }
-        ADVANCE;
-    }
-    else
-        p = search_terms(cclp, ap);
-    return p;
+    return search_terms(cclp, ap);
 }
 
 /**
- * qualifier_list: Parse CCL qualifiers and search terms. 
+ * qualifier_list: Parse CCL qualifiers and search terms.
  * cclp:   CCL Parser
  * la:     Token pointer to RELATION token.
  * qa:     Qualifier attributes already applied.
  * return: pointer to node(s); NULL on error.
  */
-static struct ccl_rpn_node *qualifier_list(CCL_parser cclp, 
+static struct ccl_rpn_node *qualifier_list(CCL_parser cclp,
                                            struct ccl_token *la,
                                            ccl_qualifier_t *qa)
 {
@@ -824,7 +1044,7 @@ static struct ccl_rpn_node *qualifier_list(CCL_parser cclp,
             {
                 struct ccl_rpn_node *node_sub;
                 cclp->look_token = la;
-                
+
                 node_sub = qualifier_relation(cclp, ap);
                 if (!node_sub)
                 {
@@ -832,16 +1052,7 @@ static struct ccl_rpn_node *qualifier_list(CCL_parser cclp,
                     xfree(ap);
                     return 0;
                 }
-                if (node)
-                {
-                    struct ccl_rpn_node *node_this = 
-                        ccl_rpn_node_create(CCL_RPN_OR);
-                    node_this->u.p[0] = node;
-                    node_this->u.p[1] = node_sub;
-                    node = node_this;
-                }
-                else
-                    node = node_sub;
+                node = ccl_rpn_node_mkbool(node, node_sub, CCL_RPN_OR);
                 seq++;
             }
             if (seq == 0)
@@ -887,33 +1098,24 @@ static struct ccl_rpn_node *qualifier_list(CCL_parser cclp,
             if (qa)
             {
                 ccl_qualifier_t *qa0 = qa;
-                
+
                 while (*qa0)
                     ap[i++] = *qa0++;
             }
             ap[i] = NULL;
-            
+
             if (!found)
                 break;
-            
+
             cclp->look_token = lookahead;
-            
+
             node_sub = qualifier_relation(cclp, ap);
             if (!node_sub)
             {
                 ccl_rpn_delete(node);
                 break;
             }
-            if (node)
-            {
-                struct ccl_rpn_node *node_this = 
-                    ccl_rpn_node_create(CCL_RPN_OR);
-                node_this->u.p[0] = node;
-                node_this->u.p[1] = node_sub;
-                node = node_this;
-            }
-            else
-                node = node_sub;
+            node = ccl_rpn_node_mkbool(node, node_sub, CCL_RPN_OR);
             seq++;
         }
     }
@@ -931,9 +1133,10 @@ static struct ccl_rpn_node *qualifier_list(CCL_parser cclp,
 static struct ccl_rpn_node *search_terms(CCL_parser cclp, ccl_qualifier_t *qa)
 {
     static int list[] = {
-        CCL_TOK_TERM, CCL_TOK_COMMA,CCL_TOK_EQ, CCL_TOK_REL, CCL_TOK_SET, -1};
+        CCL_TOK_TERM, CCL_TOK_COMMA,CCL_TOK_EQ,
+        CCL_TOK_REL, CCL_TOK_SET, -1};
     struct ccl_rpn_node *p1, *p2, *pn;
-    p1 = search_term_x(cclp, qa, list, 1);
+    p1 = search_terms2(cclp, qa);
     if (!p1)
         return NULL;
     while (1)
@@ -951,7 +1154,7 @@ static struct ccl_rpn_node *search_terms(CCL_parser cclp, ccl_qualifier_t *qa)
             p_prox->u.t.attr_list = 0;
 
             ADVANCE;
-            p2 = search_term_x(cclp, qa, list, 1);
+            p2 = search_terms2(cclp, qa);
             if (!p2)
             {
                 ccl_rpn_delete(p1);
@@ -965,7 +1168,7 @@ static struct ccl_rpn_node *search_terms(CCL_parser cclp, ccl_qualifier_t *qa)
         }
         else if (is_term_ok(KIND, list))
         {
-            p2 = search_term_x(cclp, qa, list, 1);
+            p2 = search_terms2(cclp, qa);
             if (!p2)
             {
                 ccl_rpn_delete(p1);
@@ -994,22 +1197,7 @@ static struct ccl_rpn_node *search_elements(CCL_parser cclp,
 {
     struct ccl_rpn_node *p1;
     struct ccl_token *lookahead;
-    if (KIND == CCL_TOK_LP)
-    {
-        ADVANCE;
-        p1 = find_spec(cclp, qa);
-        if (!p1)
-            return NULL;
-        if (KIND != CCL_TOK_RP)
-        {
-            cclp->error_code = CCL_ERR_RP_EXPECTED;
-            ccl_rpn_delete(p1);
-            return NULL;
-        }
-        ADVANCE;
-        return p1;
-    }
-    else if (KIND == CCL_TOK_SET)
+    if (KIND == CCL_TOK_SET)
     {
         ADVANCE;
         if (KIND == CCL_TOK_EQ)
@@ -1035,7 +1223,7 @@ static struct ccl_rpn_node *search_elements(CCL_parser cclp,
             break;
         lookahead = lookahead->next;
     }
-    if (qa)
+    if (qa || lookahead->kind == CCL_TOK_LP)
         return search_terms(cclp, qa);
     else
     {
@@ -1060,17 +1248,7 @@ static struct ccl_rpn_node *search_elements(CCL_parser cclp,
                 ccl_rpn_delete(node);
                 return 0;
             }
-            if (node)
-            {
-                struct ccl_rpn_node *node_this = 
-                    ccl_rpn_node_create(CCL_RPN_OR);
-                node_this->u.p[0] = node;
-                node_this->u.p[1] = node_sub;
-                node_this->u.p[2] = 0;
-                node = node_this;
-            }
-            else
-                node = node_sub;
+            node = ccl_rpn_node_mkbool(node, node_sub, CCL_RPN_OR);
         }
         if (!node)
             node = search_terms(cclp, 0);
@@ -1086,7 +1264,7 @@ static struct ccl_rpn_node *search_elements(CCL_parser cclp,
  */
 static struct ccl_rpn_node *find_spec(CCL_parser cclp, ccl_qualifier_t *qa)
 {
-    struct ccl_rpn_node *p1, *p2, *pn;
+    struct ccl_rpn_node *p1, *p2;
     if (!(p1 = search_elements(cclp, qa)))
         return NULL;
     while (1)
@@ -1101,11 +1279,7 @@ static struct ccl_rpn_node *find_spec(CCL_parser cclp, ccl_qualifier_t *qa)
                 ccl_rpn_delete(p1);
                 return NULL;
             }
-            pn = ccl_rpn_node_create(CCL_RPN_AND);
-            pn->u.p[0] = p1;
-            pn->u.p[1] = p2;
-            pn->u.p[2] = 0;
-            p1 = pn;
+            p1 = ccl_rpn_node_mkbool(p1, p2, CCL_RPN_AND);
             continue;
         case CCL_TOK_OR:
             ADVANCE;
@@ -1115,11 +1289,7 @@ static struct ccl_rpn_node *find_spec(CCL_parser cclp, ccl_qualifier_t *qa)
                 ccl_rpn_delete(p1);
                 return NULL;
             }
-            pn = ccl_rpn_node_create(CCL_RPN_OR);
-            pn->u.p[0] = p1;
-            pn->u.p[1] = p2;
-            pn->u.p[2] = 0;
-            p1 = pn;
+            p1 = ccl_rpn_node_mkbool(p1, p2, CCL_RPN_OR);
             continue;
         case CCL_TOK_NOT:
             ADVANCE;
@@ -1129,11 +1299,7 @@ static struct ccl_rpn_node *find_spec(CCL_parser cclp, ccl_qualifier_t *qa)
                 ccl_rpn_delete(p1);
                 return NULL;
             }
-            pn = ccl_rpn_node_create(CCL_RPN_NOT);
-            pn->u.p[0] = p1;
-            pn->u.p[1] = p2;
-            pn->u.p[2] = 0;
-            p1 = pn;
+            p1 = ccl_rpn_node_mkbool(p1, p2, CCL_RPN_NOT);
             continue;
         }
         break;
@@ -1150,7 +1316,7 @@ struct ccl_rpn_node *ccl_parser_find_str(CCL_parser cclp, const char *str)
     return p;
 }
 
-struct ccl_rpn_node *ccl_parser_find_token(CCL_parser cclp, 
+struct ccl_rpn_node *ccl_parser_find_token(CCL_parser cclp,
                                            struct ccl_token *list)
 {
     struct ccl_rpn_node *p;
@@ -1203,6 +1369,7 @@ struct ccl_rpn_node *ccl_find_str(CCL_bibset bibset, const char *str,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab