X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclfind.c;h=3a9fd833fca4dbc5b6acbe9a3db2470c203ab11a;hb=cb2620919f499439968dffed87671ec823da5afe;hp=4e0bdb49a48614ef455b14e71e475d215e7401e4;hpb=448e7f2a48f6485a8d452c75420524fb37453bc1;p=yaz-moved-to-github.git diff --git a/ccl/cclfind.c b/ccl/cclfind.c index 4e0bdb4..3a9fd83 100644 --- a/ccl/cclfind.c +++ b/ccl/cclfind.c @@ -45,7 +45,17 @@ * Europagate, 1995 * * $Log: cclfind.c,v $ - * Revision 1.19 2000-11-16 09:58:02 adam + * Revision 1.22 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.21 2001/02/21 13:46:53 adam + * C++ fixes. + * + * Revision 1.20 2000/11/16 13:03:12 adam + * Function ccl_rpn_query sets attributeSet to Bib-1. + * + * Revision 1.19 2000/11/16 09:58:02 adam * Implemented local AttributeSet setting for CCL field maps. * * Revision 1.18 2000/10/17 19:50:28 adam @@ -297,7 +307,7 @@ static void add_attr (struct ccl_rpn_node *p, const char *set, ccl_assert (n); if (set) { - n->set = malloc (strlen(set)+1); + n->set = (char*) malloc (strlen(set)+1); strcpy (n->set, set); } else @@ -351,7 +361,7 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp, int truncation_value = -1; int completeness_value = -1; int len = 0; - int max = 200; + size_t max = 200; if (and_list || or_list) max = 1; @@ -899,6 +909,8 @@ struct ccl_rpn_node *ccl_parser_find (CCL_parser cclp, struct ccl_token *list) { struct ccl_rpn_node *p; + + cclp->look_token = list; p = find_spec (cclp, NULL); if (p && KIND != CCL_TOK_EOL)