X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fccltoken.c;h=c89b155c50b4e406465f059b586cdbda4dd61f30;hb=e46cd1b274c0f3328ebb091fa61fb41352638778;hp=2376d4b0d3695ddbcac9628576e583434ff52625;hpb=2c77fc43bcc40cc4786a39b14c76a481dbe66ffe;p=yaz-moved-to-github.git

diff --git a/ccl/ccltoken.c b/ccl/ccltoken.c
index 2376d4b..c89b155 100644
--- a/ccl/ccltoken.c
+++ b/ccl/ccltoken.c
@@ -45,7 +45,18 @@
  * Europagate, 1995
  *
  * $Log: ccltoken.c,v $
- * Revision 1.14  2000-03-14 09:06:11  adam
+ * Revision 1.17  2001-10-03 23:54:41  adam
+ * Fixes for numeric ranges (date=1980-1990).
+ *
+ * Revision 1.16  2001/03/07 13:24:40  adam
+ * Member and_not in Z_Operator is kept for backwards compatibility.
+ * Added support for definition of CCL operators in field spec file.
+ *
+ * Revision 1.15  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.14  2000/03/14 09:06:11  adam
  * Added POSIX threads support for frontend server.
  *
  * Revision 1.13  2000/02/08 10:39:53  adam
@@ -131,13 +142,19 @@ static int token_cmp (CCL_parser cclp, const char *kw, struct ccl_token *token)
 {
     const char *cp1 = kw;
     const char *cp2;
+    const char *aliases;
+    int case_sensitive = cclp->ccl_case_sensitive;
+
+    aliases = ccl_qual_search_special(cclp->bibset, "case");
+    if (aliases)
+	case_sensitive = atoi(aliases);
     if (!kw)
         return 0;
     while ((cp2 = strchr (cp1, ' ')))
     {
         if (token->len == (size_t) (cp2-cp1))
         {
-            if (cclp->ccl_case_sensitive)
+            if (case_sensitive)
             {
                 if (!memcmp (cp1, token->name, token->len))
                     return 1;
@@ -150,7 +167,7 @@ static int token_cmp (CCL_parser cclp, const char *kw, struct ccl_token *token)
         }
 	cp1 = cp2+1;
     }
-    if (cclp->ccl_case_sensitive)
+    if (case_sensitive)
         return token->len == strlen(cp1) 
             && !memcmp (cp1, token->name, token->len);
     return token->len == strlen(cp1) &&
@@ -225,6 +242,7 @@ struct ccl_token *ccl_token_simple (const char *command)
  */
 struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
 {
+    const char *aliases;
     const char *cp = command;
     struct ccl_token *first = NULL;
     struct ccl_token *last = NULL;
@@ -289,9 +307,6 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
 	    else
 		last->kind = CCL_TOK_REL;
 	    break;
-	case '-':
-	    last->kind = CCL_TOK_MINUS;
-	    break;
 	case '\"':
 	    last->kind = CCL_TOK_TERM;
 	    last->name = cp;
@@ -305,21 +320,40 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
 		cp++;
 	    break;
 	default:
-	    while (*cp && !strchr ("(),%!><=- \t\n\r", *cp))
+	    if (!strchr ("(),%!><=- \t\n\r", cp[-1]))
 	    {
-		cp++;
-		++ last->len;
+		while (*cp && !strchr ("(),%!><=- \t\n\r", *cp))
+		{
+		    cp++;
+		    ++ last->len;
+		}
 	    }
-	    if (token_cmp (cclp, cclp->ccl_token_and, last))
+	    last->kind = CCL_TOK_TERM;
+
+	    aliases = ccl_qual_search_special(cclp->bibset, "and");
+	    if (!aliases)
+		aliases = cclp->ccl_token_and;
+	    if (token_cmp (cclp, aliases, last))
 	        last->kind = CCL_TOK_AND;
-	    else if (token_cmp (cclp, cclp->ccl_token_or, last))
+
+	    aliases = ccl_qual_search_special(cclp->bibset, "or");
+	    if (!aliases)
+		aliases = cclp->ccl_token_or;
+	    if (token_cmp (cclp, aliases, last))
 	        last->kind = CCL_TOK_OR;
-            else if (token_cmp (cclp, cclp->ccl_token_not, last))
+
+	    aliases = ccl_qual_search_special(cclp->bibset, "not");
+	    if (!aliases)
+		aliases = cclp->ccl_token_not;
+            if (token_cmp (cclp, aliases, last))
 	        last->kind = CCL_TOK_NOT;
-	    else if (token_cmp (cclp, cclp->ccl_token_set, last))
+
+	    aliases = ccl_qual_search_special(cclp->bibset, "set");
+	    if (!aliases)
+		aliases = cclp->ccl_token_set;
+
+	    if (token_cmp (cclp, aliases, last))
 	        last->kind = CCL_TOK_SET;
-	    else
-		last->kind = CCL_TOK_TERM;
 	}
     }
     return first;
@@ -351,7 +385,7 @@ void ccl_token_del (struct ccl_token *list)
     }
 }
 
-static char *ccl_strdup (const char *str)
+char *ccl_strdup (const char *str)
 {
     int len = strlen(str);
     char *p = (char*) malloc (len+1);
@@ -392,23 +426,39 @@ void ccl_parser_destroy (CCL_parser p)
 void ccl_parser_set_op_and (CCL_parser p, const char *op)
 {
     if (p && op)
+    {
+	if (p->ccl_token_and)
+	    free (p->ccl_token_and);
 	p->ccl_token_and = ccl_strdup (op);
+    }
 }
 
 void ccl_parser_set_op_or (CCL_parser p, const char *op)
 {
     if (p && op)
+    {
+	if (p->ccl_token_or)
+	    free (p->ccl_token_or);
 	p->ccl_token_or = ccl_strdup (op);
+    }
 }
 void ccl_parser_set_op_not (CCL_parser p, const char *op)
 {
     if (p && op)
+    {
+	if (p->ccl_token_not)
+	    free (p->ccl_token_not);
 	p->ccl_token_not = ccl_strdup (op);
+    }
 }
 void ccl_parser_set_op_set (CCL_parser p, const char *op)
 {
     if (p && op)
+    {
+	if (p->ccl_token_set)
+	    free (p->ccl_token_set);
 	p->ccl_token_set = ccl_strdup (op);
+    }
 }
 
 void ccl_parser_set_case (CCL_parser p, int case_sensitivity_flag)