X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclfind.c;h=5d7f821448d4772098be300afd5de7f32975e98f;hp=621d79d47eeb1877a7860811920b2a3d264bc324;hb=df60350f9737923dce347e59b9c4cafa789ab7aa;hpb=349f8f12502e38018d65da6a6b89cdc95992496a

diff --git a/src/cclfind.c b/src/cclfind.c
index 621d79d..5d7f821 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -100,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;
@@ -159,7 +159,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;
@@ -170,9 +170,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);
@@ -181,7 +179,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;
 }
 
@@ -195,9 +192,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;
 }
@@ -205,9 +200,7 @@ 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);
 }
@@ -331,10 +324,7 @@ static struct ccl_rpn_node *ccl_term_one_use(CCL_parser cclp,
                                              struct ccl_rpn_attr *attr_use,
                                              ccl_qualifier_t *qa,
                                              size_t no, int term_len,
-                                             const char **truncation_aliases,
-                                             const char **mask_aliases,
                                              int is_phrase,
-                                             int is_ccl_masked,
                                              int auto_group)
 {
     struct ccl_rpn_node *p;
@@ -349,8 +339,39 @@ static struct ccl_rpn_node *ccl_term_one_use(CCL_parser cclp,
     int right_trunc = 0;
     int regex_trunc = 0;
     int z3958_trunc = 0;
+    int is_ccl_masked = 0;
     char *attset;
     struct ccl_token *lookahead = cclp->look_token;
+    const char **truncation_aliases;
+    const char *t_default[2];
+    const char **mask_aliases;
+    const char *m_default[2];
+
+    truncation_aliases =
+        ccl_qual_search_special(cclp->bibset, "truncation");
+    if (!truncation_aliases)
+    {
+        truncation_aliases = t_default;
+        t_default[0] = "?";
+        t_default[1] = 0;
+    }
+    mask_aliases =
+        ccl_qual_search_special(cclp->bibset, "mask");
+    if (!mask_aliases)
+    {
+        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;
+        lookahead = lookahead->next;
+    }
+    lookahead = cclp->look_token;
 
     p = ccl_rpn_node_create(CCL_RPN_TERM);
     p->u.t.attr_list = NULL;
@@ -526,29 +547,6 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
     int and_list = 0;
     int auto_group = 0;
     int or_list = 0;
-    const char **truncation_aliases;
-    const char *t_default[2];
-    const char **mask_aliases;
-    const char *m_default[2];
-
-    truncation_aliases =
-        ccl_qual_search_special(cclp->bibset, "truncation");
-    if (!truncation_aliases)
-    {
-        truncation_aliases = t_default;
-        t_default[0] = "?";
-        t_default[1] = 0;
-    }
-
-    mask_aliases =
-        ccl_qual_search_special(cclp->bibset, "mask");
-    if (!mask_aliases)
-    {
-        mask_aliases = m_default;
-        m_default[0] = "#";
-        m_default[1] = 0;
-    }
-
 
     if (qual_val_type(qa, CCL_BIB1_STR, CCL_BIB1_STR_AND_LIST, 0))
         and_list = 1;
@@ -562,7 +560,6 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         size_t no, i;
         int len = 0;
         int is_phrase = 0;
-        int is_ccl_masked = 0;
         size_t max = 200;
         if (and_list || or_list || !multi)
             max = 1;
@@ -580,12 +577,6 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
             for (i = 0; i<lookahead->len; i++)
                 if (lookahead->name[i] == ' ')
                     this_is_phrase = 1;
-
-            if (has_ccl_masking(lookahead->name, lookahead->len,
-                                truncation_aliases,
-                                mask_aliases))
-                is_ccl_masked = 1;
-
             if (auto_group)
             {
                 if (no > 0 && (is_phrase || is_phrase != this_is_phrase))
@@ -611,9 +602,7 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                 {
                     struct ccl_rpn_node *tmp2;
                     tmp2 = ccl_term_one_use(cclp, attr, qa, no, len,
-                                            truncation_aliases, mask_aliases,
-                                            is_phrase, is_ccl_masked,
-                                            auto_group);
+                                            is_phrase, auto_group);
                     if (!tmp2)
                     {
                         ccl_rpn_delete(p);
@@ -632,15 +621,12 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                 }
         }
         if (!p)
-        {
             p = ccl_term_one_use(cclp, 0 /* attr: no use */, qa, no, len,
-                                 truncation_aliases, mask_aliases,
-                                 is_phrase, is_ccl_masked, auto_group);
-            if (!p)
-                return 0;
-        }
+                                 is_phrase, auto_group);
         for (i = 0; i < no; i++)
             ADVANCE;
+        if (!p)
+            return 0;
         /* make the top node point to us.. */
         if (p_top)
         {
@@ -704,7 +690,6 @@ static struct ccl_rpn_node *search_terms2(CCL_parser cclp,
 }
 
 
-
 static
 struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
                                       ccl_qualifier_t *ap, char *attset)