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

diff --git a/src/cclfind.c b/src/cclfind.c
index 6fd3144..131ec27 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -213,7 +213,8 @@ void ccl_add_attr_string(struct ccl_rpn_node *p, const char *set,
 }
 
 
-#define REGEX_CHARS "^[]{}()|.*+?!\"$"
+#define REGEX_CHARS "^[]{}()|.*+?!$"
+#define CCL_CHARS "#?\\"
 /**
  * search_term: Parse CCL search term. 
  * cclp:   CCL Parser
@@ -261,6 +262,7 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         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;
@@ -364,6 +366,11 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         {
             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 * 2 + 2);
@@ -378,10 +385,8 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
 
             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, cclp->look_token->ws_prefix_buf,
+                        cclp->look_token->ws_prefix_len);
             }
             for (j = 0; j < src_len; j++)
             {
@@ -390,10 +395,13 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                     if (regex_trunc && strchr(REGEX_CHARS "\\", src_str[j]))
                     {
                         regex_trunc = 2;
-                        strcat(p->u.t.term, "\\\\");
+                        strcat(p->u.t.term, "\\");
                     }
-                    if (src_str[j] == '\\')
+                    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] == '"')
@@ -405,6 +413,11 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                         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)
@@ -423,6 +436,11 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                         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;
@@ -435,7 +453,12 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
                     if (regex_trunc && strchr(REGEX_CHARS, src_str[j]))
                     {
                         regex_trunc = 2;
-                        strcat(p->u.t.term, "\\\\");
+                        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);                    
                 }
@@ -500,6 +523,10 @@ static struct ccl_rpn_node *search_term_x(CCL_parser cclp,
         {
             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,