X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclfind.c;h=ba12079846fb8b2047839f74bddd24c9df630336;hb=45f8f517ebe10930067907c19a56557afd779826;hp=99cc3b5ee8e0434a8407f7a78dfa218f9c5f0305;hpb=88ce7f5c3713fbf4992763ae38c9fb79a5ccb551;p=yaz-moved-to-github.git

diff --git a/ccl/cclfind.c b/ccl/cclfind.c
index 99cc3b5..ba12079 100644
--- a/ccl/cclfind.c
+++ b/ccl/cclfind.c
@@ -45,7 +45,22 @@
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $
- * Revision 1.13  1999-12-22 13:13:32  adam
+ * Revision 1.17  2000-05-01 09:36:50  adam
+ * Range operator only treated in ordered ranges so that minus (-) can be
+ * used for, say, the and-not operator.
+ *
+ * Revision 1.16  2000/03/14 09:06:11  adam
+ * Added POSIX threads support for frontend server.
+ *
+ * Revision 1.15  2000/02/24 23:49:13  adam
+ * Fixed memory allocation problem.
+ *
+ * Revision 1.14  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.13  1999/12/22 13:13:32  adam
  * Search terms may include "operators" without causing error.
  *
  * Revision 1.12  1999/11/30 13:47:11  adam
@@ -125,9 +140,7 @@
  *
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <string.h>
 
 #include <yaz/ccl.h>
@@ -185,7 +198,7 @@ static void strxcat (char *n, const char *src, int len)
 static char *copy_token_name (struct ccl_token *tp)
 {
     char *str = (char *)malloc (tp->len + 1);
-    assert (str);
+    ccl_assert (str);
     memcpy (str, tp->name, tp->len);
     str[tp->len] = '\0';
     return str;
@@ -200,7 +213,7 @@ static struct ccl_rpn_node *mk_node (int kind)
 {
     struct ccl_rpn_node *p;
     p = (struct ccl_rpn_node *)malloc (sizeof(*p));
-    assert (p);
+    ccl_assert (p);
     p->kind = kind;
     return p;
 }
@@ -266,7 +279,7 @@ static void add_attr (struct ccl_rpn_node *p, int type, int value)
     struct ccl_rpn_attr *n;
 
     n = (struct ccl_rpn_attr *)malloc (sizeof(*n));
-    assert (n);
+    ccl_assert (n);
     n->type = type;
     n->value = value;
     n->next = p->u.t.attr_list;
@@ -283,6 +296,7 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
 					   struct ccl_rpn_attr **qa,
                                            int *term_list)
 {
+    struct ccl_rpn_attr *qa_tmp[2];
     struct ccl_rpn_node *p;
     struct ccl_token *lookahead = cclp->look_token;
     int len = 0;
@@ -310,8 +324,8 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
     {
         /* no qualifier(s) applied. Use 'term' if it is defined */
 
-        qa = (struct ccl_rpn_attr **)malloc (2*sizeof(*qa));
-	assert (qa);
+        qa = qa_tmp;
+	ccl_assert (qa);
 	qa[0] = ccl_qual_search (cclp, "term", 4);
 	qa[1] = NULL;
     }
@@ -389,7 +403,7 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
 
     /* make the RPN token */
     p->u.t.term = (char *)malloc (len);
-    assert (p->u.t.term);
+    ccl_assert (p->u.t.term);
     p->u.t.term[0] = '\0';
     for (i = 0; i<no; i++)
     {
@@ -403,8 +417,16 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
         }
         else if (i == no-1 && right_trunc)
             src_len--;
-        if (i)
-            strcat (p->u.t.term, " ");
+        if (src_len)
+        {
+            int len = strlen(p->u.t.term);
+            if (len &&
+                !strchr("-+", *src_str) &&
+                !strchr("-+", p->u.t.term[len-1]))
+            {
+                strcat (p->u.t.term, " ");
+            }
+        }
 	strxcat (p->u.t.term, src_str, src_len);
         ADVANCE;
     }
@@ -413,7 +435,6 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
         if (!qual_val_type (qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_BOTH))
         {
             cclp->error_code = CCL_ERR_TRUNC_NOT_BOTH;
-            free (qa);
             ccl_rpn_delete (p);
             return NULL;
         }
@@ -424,7 +445,6 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
         if (!qual_val_type (qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_RIGHT))
         {
             cclp->error_code = CCL_ERR_TRUNC_NOT_RIGHT;
-            free (qa);
             ccl_rpn_delete (p);
             return NULL;
         }
@@ -435,7 +455,6 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
         if (!qual_val_type (qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_LEFT))
         {
             cclp->error_code = CCL_ERR_TRUNC_NOT_LEFT;
-            free (qa);
             ccl_rpn_delete (p);
             return NULL;
         }
@@ -484,7 +503,7 @@ static struct ccl_rpn_node *qualifiers (CCL_parser cclp, struct ccl_token *la,
         for (i=0; qa[i]; i++)
 	    no++;
     ap = (struct ccl_rpn_attr **)malloc ((no+1) * sizeof(*ap));
-    assert (ap);
+    ccl_assert (ap);
     for (i = 0; cclp->look_token != la; i++)
     {
         ap[i] = ccl_qual_search (cclp, cclp->look_token->name,
@@ -564,7 +583,8 @@ static struct ccl_rpn_node *qualifiers (CCL_parser cclp, struct ccl_token *la,
 
         ADVANCE;                      /* skip relation */
         if (KIND == CCL_TOK_TERM &&
-	    cclp->look_token->next->kind == CCL_TOK_MINUS)
+            cclp->look_token->next->len == 1 &&
+            cclp->look_token->next->name[0] == '-')
         {
             struct ccl_rpn_node *p1;
             if (!(p1 = search_term (cclp, ap)))
@@ -598,7 +618,8 @@ static struct ccl_rpn_node *qualifiers (CCL_parser cclp, struct ccl_token *la,
                 return p1;
             }
         }
-        else if (KIND == CCL_TOK_MINUS)   /* = - term  ? */
+        else if (cclp->look_token->len == 1 &&
+                 cclp->look_token->name[0] == '"')   /* = - term  ? */
         {
             ADVANCE;
             if (!(p = search_term (cclp, ap)))
@@ -656,8 +677,7 @@ static struct ccl_rpn_node *search_terms (CCL_parser cclp,
 					  struct ccl_rpn_attr **qa)
 {
     static int list[] = {
-        CCL_TOK_TERM, CCL_TOK_COMMA,CCL_TOK_EQ,
-        CCL_TOK_REL, CCL_TOK_MINUS, -1};
+        CCL_TOK_TERM, CCL_TOK_COMMA,CCL_TOK_EQ, CCL_TOK_REL, -1};
     struct ccl_rpn_node *p1, *p2, *pn;
     p1 = search_term_x (cclp, qa, list);
     if (!p1)