X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcclfind.c;h=131ec27d33e3af37fd154bcb29c3808d7c237ed5;hb=3c287bc1d48ee6a1f300054c2cebd0ba312bd5b9;hp=d5518dff640ee1f8ef94f83ee3e02918427e2a1a;hpb=d22199db5fdac737990cebcd0f7c77232fcf5d0c;p=yaz-moved-to-github.git

diff --git a/src/cclfind.c b/src/cclfind.c
index d5518df..131ec27 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "cclp.h"
 
@@ -212,6 +213,8 @@ void ccl_add_attr_string(struct ccl_rpn_node *p, const char *set,
 }
 
 
+#define REGEX_CHARS "^[]{}()|.*+?!$"
+#define CCL_CHARS "#?\\"
 /**
  * search_term: Parse CCL search term. 
  * cclp:   CCL Parser
@@ -258,6 +261,8 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         int len = 0;
         int left_trunc = 0;
         int right_trunc = 0;
+        int regex_trunc = 0;
+        int z3958_trunc = 0;
         size_t max = 200;
         if (and_list || or_list || !multi)
             max = 1;
@@ -356,34 +361,108 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                 ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 1);
         }
 
+        if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_REGEX,
+                          &attset))
+        {
+            regex_trunc = 1; /* regex trunc (102) allowed */
+        }
+        else if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_Z3958,
+                          &attset))
+        {
+            z3958_trunc = 1; /* Z39.58 trunc (CCL) trunc allowed */
+        }
+
         /* make the RPN token */
-        p->u.t.term = (char *)xmalloc(len);
+        p->u.t.term = (char *)xmalloc(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 = cclp->look_token->name;
             size_t src_len = cclp->look_token->len;
+            int j;
+            int quote_mode = 0;
 
-            if (i == 0 && src_len > 0 && *src_str == '?')
-            {
-                src_len--;
-                src_str++;
-                left_trunc = 1;
-            }
-            if (i == no - 1 && src_len > 0 && src_str[src_len-1] == '?')
+            if (p->u.t.term[0] && cclp->look_token->ws_prefix_len)
             {
-                src_len--;
-                right_trunc = 1;
+                strxcat(p->u.t.term, cclp->look_token->ws_prefix_buf,
+                        cclp->look_token->ws_prefix_len);
             }
-            if (p->u.t.term[0] && cclp->look_token->ws_prefix_len)
+            for (j = 0; j < src_len; j++)
             {
-                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';
+                if (j > 0 && src_str[j-1] == '\\')
+                {
+                    if (regex_trunc && strchr(REGEX_CHARS "\\", src_str[j]))
+                    {
+                        regex_trunc = 2;
+                        strcat(p->u.t.term, "\\");
+                    }
+                    else if (z3958_trunc && strchr(CCL_CHARS "\\", src_str[j]))
+                    {
+                        z3958_trunc = 2;
+                        strcat(p->u.t.term, "\\");
+                    }
+                    strxcat(p->u.t.term, src_str + j, 1);
+                }
+                else if (src_str[j] == '"')
+                    quote_mode = !quote_mode;
+                else if (!quote_mode && src_str[j] == '?')
+                {
+                    if (regex_trunc)
+                    {
+                        strcat(p->u.t.term, ".*");
+                        regex_trunc = 2; /* regex trunc is really needed */
+                    }
+                    else if (z3958_trunc)
+                    {
+                        strcat(p->u.t.term, "?");
+                        z3958_trunc = 2;
+                    }
+                    else if (i == 0 && j == 0)
+                        left_trunc = 1;
+                    else if (i == no - 1 && j == src_len - 1)
+                        right_trunc = 1;
+                    else
+                    {
+                        cclp->error_code = CCL_ERR_TRUNC_NOT_BOTH;
+                        ccl_rpn_delete(p);
+                        return NULL;
+                    }
+                }
+                else if (!quote_mode && src_str[j] == '#')
+                {
+                    if (regex_trunc)
+                    {
+                        strcat(p->u.t.term, ".");
+                        regex_trunc = 2; /* regex trunc is really needed */
+                    }
+                    else if (z3958_trunc)
+                    {
+                        strcat(p->u.t.term, "#");
+                        z3958_trunc = 2;
+                    }
+                    else
+                    {
+                        cclp->error_code = CCL_ERR_TRUNC_NOT_BOTH;
+                        ccl_rpn_delete(p);
+                        return NULL;
+                    }
+                }
+                else if (src_str[j] != '\\')
+                {
+                    if (regex_trunc && strchr(REGEX_CHARS, src_str[j]))
+                    {
+                        regex_trunc = 2;
+                        strcat(p->u.t.term, "\\");
+                    }
+                    else if (z3958_trunc && strchr(CCL_CHARS, src_str[j]))
+                    {
+                        z3958_trunc = 2;
+                        strcat(p->u.t.term, "\\");
+                    }
+                    strxcat(p->u.t.term, src_str + j, 1);                    
+                }
             }
-            strxcat(p->u.t.term, src_str, src_len);
             ADVANCE;
         }
 
@@ -440,6 +519,14 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
             }
             ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 2);
         }
+        else if (regex_trunc == 2)
+        {
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 102);
+        }
+        else if (z3958_trunc == 2)
+        {
+            ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 104);
+        }
         else
         {
             if (qual_val_type(qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_NONE,