/* CCL find (to rpn conversion)
* Europagate, 1995
*
- * $Id: cclfind.c,v 1.8 2005-06-25 15:46:03 adam Exp $
+ * $Id: cclfind.c,v 1.11 2007-04-26 21:45:17 adam Exp $
*
* Old Europagate log:
*
#include <stdlib.h>
#include <string.h>
-#include <yaz/ccl.h>
+#include "cclp.h"
/* returns type of current lookahead */
#define KIND (cclp->look_token->kind)
* kind: Type of node.
* return: pointer to allocated node.
*/
-static struct ccl_rpn_node *mk_node (int kind)
+struct ccl_rpn_node *ccl_rpn_node_create(enum ccl_rpn_kind kind)
{
struct ccl_rpn_node *p;
p = (struct ccl_rpn_node *)xmalloc (sizeof(*p));
ccl_assert (p);
p->kind = kind;
+
+ switch(kind)
+ {
+ case CCL_RPN_TERM:
+ p->u.t.attr_list = 0;
+ p->u.t.term = 0;
+ break;
+ default:
+ break;
+ }
return p;
}
n = (struct ccl_rpn_attr *)xmalloc (sizeof(*n));
ccl_assert (n);
if (set)
- {
- n->set = (char*) xmalloc (strlen(set)+1);
- strcpy (n->set, set);
- }
+ n->set = xstrdup(set);
else
n->set = 0;
n->type = type;
n->next = p->u.t.attr_list;
p->u.t.attr_list = n;
- n->kind = CCL_RPN_ATTR_NUMERIC;
- n->value.numeric = 0;
return n;
}
* value: Value of attribute
* set: Attribute set name
*/
-static void add_attr_numeric (struct ccl_rpn_node *p, const char *set,
- int type, int value)
+void ccl_add_attr_numeric(struct ccl_rpn_node *p, const char *set,
+ int type, int value)
{
struct ccl_rpn_attr *n;
n->value.numeric = value;
}
-static void add_attr_string (struct ccl_rpn_node *p, const char *set,
- int type, char *value)
+void ccl_add_attr_string(struct ccl_rpn_node *p, const char *set,
+ int type, char *value)
{
struct ccl_rpn_attr *n;
if (p_top)
{
if (or_list)
- p = mk_node (CCL_RPN_OR);
+ p = ccl_rpn_node_create(CCL_RPN_OR);
else if (and_list)
- p = mk_node (CCL_RPN_AND);
+ p = ccl_rpn_node_create(CCL_RPN_AND);
else
- p = mk_node (CCL_RPN_AND);
+ p = ccl_rpn_node_create(CCL_RPN_AND);
p->u.p[0] = p_top;
p_top = p;
}
/* create the term node, but wait a moment before adding the term */
- p = mk_node (CCL_RPN_TERM);
+ p = ccl_rpn_node_create(CCL_RPN_TERM);
p->u.t.attr_list = NULL;
p->u.t.term = NULL;
switch(attr->kind)
{
case CCL_RPN_ATTR_STRING:
- add_attr_string(p, attr->set, attr->type,
- attr->value.str);
+ ccl_add_attr_string(p, attr->set, attr->type,
+ attr->value.str);
break;
case CCL_RPN_ATTR_NUMERIC:
if (attr->value.numeric > 0)
completeness_value = attr->value.numeric;
break;
}
- add_attr_numeric(p, attr->set, attr->type,
- attr->value.numeric);
+ ccl_add_attr_numeric(p, attr->set, attr->type,
+ attr->value.numeric);
}
}
}
{ /* no structure attribute met. Apply either structure attribute
WORD or PHRASE depending on number of CCL tokens */
if (no == 1 && no_spaces == 0)
- add_attr_numeric (p, attset, CCL_BIB1_STR, 2);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 2);
else
- add_attr_numeric (p, attset, CCL_BIB1_STR, 1);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_STR, 1);
}
/* make the RPN token */
ccl_rpn_delete (p);
return NULL;
}
- add_attr_numeric (p, attset, CCL_BIB1_TRU, 3);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 3);
}
else if (right_trunc)
{
ccl_rpn_delete (p);
return NULL;
}
- add_attr_numeric (p, attset, CCL_BIB1_TRU, 1);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 1);
}
else if (left_trunc)
{
ccl_rpn_delete (p);
return NULL;
}
- add_attr_numeric (p, attset, CCL_BIB1_TRU, 2);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 2);
}
else
{
if (qual_val_type (qa, CCL_BIB1_TRU, CCL_BIB1_TRU_CAN_NONE,
&attset))
- add_attr_numeric (p, attset, CCL_BIB1_TRU, 100);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_TRU, 100);
}
if (!multi)
break;
ccl_rpn_delete (p1);
return NULL;
}
- p = mk_node (CCL_RPN_AND);
+ p = ccl_rpn_node_create(CCL_RPN_AND);
p->u.p[0] = p1;
- add_attr_numeric (p1, attset, CCL_BIB1_REL, 4);
+ ccl_add_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
p->u.p[1] = p2;
- add_attr_numeric (p2, attset, CCL_BIB1_REL, 2);
+ ccl_add_attr_numeric(p2, attset, CCL_BIB1_REL, 2);
return p;
}
else /* = term - */
{
- add_attr_numeric (p1, attset, CCL_BIB1_REL, 4);
+ ccl_add_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
return p1;
}
}
ADVANCE;
if (!(p = search_term (cclp, ap)))
return NULL;
- add_attr_numeric (p, attset, CCL_BIB1_REL, 2);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, 2);
return p;
}
else if (KIND == CCL_TOK_LP)
{
if (!(p = search_terms (cclp, ap)))
return NULL;
- add_attr_numeric (p, attset, CCL_BIB1_REL, rel);
+ ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, rel);
return p;
}
cclp->error_code = CCL_ERR_TERM_EXPECTED;
}
if (node)
{
- struct ccl_rpn_node *node_this = mk_node(CCL_RPN_OR);
+ struct ccl_rpn_node *node_this =
+ ccl_rpn_node_create(CCL_RPN_OR);
node_this->u.p[0] = node;
node_this->u.p[1] = node_sub;
node = node_this;
}
if (node)
{
- struct ccl_rpn_node *node_this = mk_node(CCL_RPN_OR);
+ struct ccl_rpn_node *node_this =
+ ccl_rpn_node_create(CCL_RPN_OR);
node_this->u.p[0] = node;
node_this->u.p[1] = node_sub;
node = node_this;
struct ccl_rpn_node *p_prox = 0;
/* ! word order specified */
/* % word order not specified */
- p_prox = mk_node(CCL_RPN_TERM);
+ p_prox = ccl_rpn_node_create(CCL_RPN_TERM);
p_prox->u.t.term = (char *) xmalloc(1 + cclp->look_token->len);
memcpy(p_prox->u.t.term, cclp->look_token->name,
cclp->look_token->len);
ccl_rpn_delete (p1);
return NULL;
}
- pn = mk_node (CCL_RPN_PROX);
+ pn = ccl_rpn_node_create(CCL_RPN_PROX);
pn->u.p[0] = p1;
pn->u.p[1] = p2;
pn->u.p[2] = p_prox;
ccl_rpn_delete (p1);
return NULL;
}
- pn = mk_node (CCL_RPN_PROX);
+ pn = ccl_rpn_node_create(CCL_RPN_PROX);
pn->u.p[0] = p1;
pn->u.p[1] = p2;
pn->u.p[2] = 0;
cclp->error_code = CCL_ERR_SETNAME_EXPECTED;
return NULL;
}
- p1 = mk_node (CCL_RPN_SET);
+ p1 = ccl_rpn_node_create(CCL_RPN_SET);
p1->u.setname = copy_token_name (cclp->look_token);
ADVANCE;
return p1;
}
if (node)
{
- struct ccl_rpn_node *node_this = mk_node(CCL_RPN_OR);
+ struct ccl_rpn_node *node_this =
+ ccl_rpn_node_create(CCL_RPN_OR);
node_this->u.p[0] = node;
node_this->u.p[1] = node_sub;
node_this->u.p[2] = 0;
ccl_rpn_delete (p1);
return NULL;
}
- pn = mk_node (CCL_RPN_AND);
+ pn = ccl_rpn_node_create(CCL_RPN_AND);
pn->u.p[0] = p1;
pn->u.p[1] = p2;
pn->u.p[2] = 0;
ccl_rpn_delete (p1);
return NULL;
}
- pn = mk_node (CCL_RPN_OR);
+ pn = ccl_rpn_node_create(CCL_RPN_OR);
pn->u.p[0] = p1;
pn->u.p[1] = p2;
pn->u.p[2] = 0;
ccl_rpn_delete (p1);
return NULL;
}
- pn = mk_node (CCL_RPN_NOT);
+ pn = ccl_rpn_node_create(CCL_RPN_NOT);
pn->u.p[0] = p1;
pn->u.p[1] = p2;
pn->u.p[2] = 0;
return p1;
}
-struct ccl_rpn_node *ccl_parser_find (CCL_parser cclp, struct ccl_token *list)
+struct ccl_rpn_node *ccl_parser_find_str(CCL_parser cclp, const char *str)
+{
+ struct ccl_rpn_node *p;
+ struct ccl_token *list = ccl_parser_tokenize(cclp, str);
+ p = ccl_parser_find_token(cclp, list);
+ ccl_token_del(list);
+ return p;
+}
+
+struct ccl_rpn_node *ccl_parser_find_token(CCL_parser cclp,
+ struct ccl_token *list)
{
struct ccl_rpn_node *p;
}
/**
- * ccl_find: Parse CCL find - token representation
- * bibset: Bibset to be used for the parsing
- * list: List of tokens
- * error: Pointer to integer. Holds error no. on completion.
- * pos: Pointer to char position. Holds approximate error position.
- * return: RPN tree on successful completion; NULL otherwise.
- */
-struct ccl_rpn_node *ccl_find (CCL_bibset bibset, struct ccl_token *list,
- int *error, const char **pos)
-{
- struct ccl_rpn_node *p;
- CCL_parser cclp = ccl_parser_create ();
-
- cclp->bibset = bibset;
-
- p = ccl_parser_find (cclp, list);
-
- *error = cclp->error_code;
- *pos = cclp->error_pos;
-
- ccl_parser_destroy (cclp);
-
- return p;
-}
-
-/**
* ccl_find_str: Parse CCL find - string representation
* bibset: Bibset to be used for the parsing
* str: String to be parsed
* pos: Pointer to char position. Holds approximate error position.
* return: RPN tree on successful completion; NULL otherwise.
*/
-struct ccl_rpn_node *ccl_find_str (CCL_bibset bibset, const char *str,
- int *error, int *pos)
+struct ccl_rpn_node *ccl_find_str(CCL_bibset bibset, const char *str,
+ int *error, int *pos)
{
- CCL_parser cclp = ccl_parser_create ();
+ CCL_parser cclp = ccl_parser_create (bibset);
struct ccl_token *list;
struct ccl_rpn_node *p;
- cclp->bibset = bibset;
-
list = ccl_parser_tokenize (cclp, str);
- p = ccl_parser_find (cclp, list);
+ p = ccl_parser_find_token(cclp, list);
*error = cclp->error_code;
if (*error)
projects / yaz-moved-to-github.git / blobdiff