X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcqltransform.c;h=d3502424ebf5c09e420895a336f68741d9fec9aa;hb=138fbf3c4582f2738e5b30e440994c9b6d76e194;hp=35e421999bc7b5b92f327da319e8b8c45a71d7cd;hpb=45754b01d18ddee3e71b79d6be871cc75c2c7c86;p=yaz-moved-to-github.git diff --git a/src/cqltransform.c b/src/cqltransform.c index 35e4219..d350242 100644 --- a/src/cqltransform.c +++ b/src/cqltransform.c @@ -1,11 +1,7 @@ -/* $Id: cqltransform.c,v 1.32 2008-01-06 19:34:34 adam Exp $ - Copyright (C) 1995-2007, Index Data ApS - Index Data Aps - -This file is part of the YAZ toolkit. - -See the file LICENSE. -*/ +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data + * See the file LICENSE for details. + */ /** * \file cqltransform.c @@ -28,6 +24,8 @@ See the file LICENSE. #include #include #include +#include +#include struct cql_prop_entry { char *pattern; @@ -37,65 +35,93 @@ struct cql_prop_entry { struct cql_transform_t_ { struct cql_prop_entry *entry; + yaz_tok_cfg_t tok_cfg; int error; char *addinfo; + WRBUF w; }; + +cql_transform_t cql_transform_create(void) +{ + cql_transform_t ct = (cql_transform_t) xmalloc(sizeof(*ct)); + ct->tok_cfg = yaz_tok_cfg_create(); + ct->w = wrbuf_alloc(); + ct->error = 0; + ct->addinfo = 0; + ct->entry = 0; + return ct; +} + cql_transform_t cql_transform_open_FILE(FILE *f) { + cql_transform_t ct = cql_transform_create(); char line[1024]; - cql_transform_t ct = (cql_transform_t) xmalloc (sizeof(*ct)); struct cql_prop_entry **pp = &ct->entry; - ct->error = 0; - ct->addinfo = 0; + yaz_tok_cfg_single_tokens(ct->tok_cfg, "="); + while (fgets(line, sizeof(line)-1, f)) { - const char *cp_value_start; - const char *cp_value_end; - const char *cp_pattern_start; - const char *cp_pattern_end; - const char *cp = line; - - while (*cp && strchr(" \t", *cp)) - cp++; - cp_pattern_start = cp; - - while (*cp && !strchr(" \t\r\n=#", *cp)) - cp++; - cp_pattern_end = cp; - if (cp == cp_pattern_start) - continue; - while (*cp && strchr(" \t", *cp)) - cp++; - if (*cp != '=') + yaz_tok_parse_t tp = yaz_tok_parse_buf(ct->tok_cfg, line); + int t; + wrbuf_rewind(ct->w); + t = yaz_tok_move(tp); + if (t == YAZ_TOK_STRING) { - *pp = 0; + char * pattern = xstrdup(yaz_tok_parse_string(tp)); + t = yaz_tok_move(tp); + if (t != '=') + { + yaz_tok_parse_destroy(tp); + cql_transform_close(ct); + return 0; + } + t = yaz_tok_move(tp); + + while (t == YAZ_TOK_STRING) + { + /* attset type=value OR type=value */ + wrbuf_puts(ct->w, yaz_tok_parse_string(tp)); + t = yaz_tok_move(tp); + if (t == YAZ_TOK_EOF) + break; + if (t == YAZ_TOK_STRING) + { + wrbuf_puts(ct->w, " "); + wrbuf_puts(ct->w, yaz_tok_parse_string(tp)); + t = yaz_tok_move(tp); + } + if (t != '=') + { + yaz_tok_parse_destroy(tp); + cql_transform_close(ct); + return 0; + } + t = yaz_tok_move(tp); + if (t != YAZ_TOK_STRING) /* value */ + { + yaz_tok_parse_destroy(tp); + cql_transform_close(ct); + return 0; + } + wrbuf_puts(ct->w, "="); + wrbuf_puts(ct->w, yaz_tok_parse_string(tp)); + t = yaz_tok_move(tp); + wrbuf_puts(ct->w, " "); + } + *pp = (struct cql_prop_entry *) xmalloc(sizeof(**pp)); + (*pp)->pattern = pattern; + (*pp)->value = xstrdup(wrbuf_cstr(ct->w)); + pp = &(*pp)->next; + } + else if (t != YAZ_TOK_EOF) + { + yaz_tok_parse_destroy(tp); cql_transform_close(ct); return 0; } - cp++; - while (*cp && strchr(" \t\r\n", *cp)) - cp++; - cp_value_start = cp; - cp_value_end = strchr(cp, '#'); - if (!cp_value_end) - cp_value_end = strlen(line) + line; - - if (cp_value_end != cp_value_start && - strchr(" \t\r\n", cp_value_end[-1])) - cp_value_end--; - *pp = (struct cql_prop_entry *) xmalloc (sizeof(**pp)); - (*pp)->pattern = (char *) xmalloc(cp_pattern_end-cp_pattern_start + 1); - memcpy ((*pp)->pattern, cp_pattern_start, - cp_pattern_end-cp_pattern_start); - (*pp)->pattern[cp_pattern_end-cp_pattern_start] = '\0'; - - (*pp)->value = (char *) xmalloc (cp_value_end-cp_value_start + 1); - if (cp_value_start != cp_value_end) - memcpy ((*pp)->value, cp_value_start, cp_value_end-cp_value_start); - (*pp)->value[cp_value_end - cp_value_start] = '\0'; - pp = &(*pp)->next; + yaz_tok_parse_destroy(tp); } *pp = 0; return ct; @@ -110,14 +136,15 @@ void cql_transform_close(cql_transform_t ct) while (pe) { struct cql_prop_entry *pe_next = pe->next; - xfree (pe->pattern); - xfree (pe->value); - xfree (pe); + xfree(pe->pattern); + xfree(pe->value); + xfree(pe); pe = pe_next; } - if (ct->addinfo) - xfree (ct->addinfo); - xfree (ct); + xfree(ct->addinfo); + yaz_tok_cfg_destroy(ct->tok_cfg); + wrbuf_destroy(ct->w); + xfree(ct); } cql_transform_t cql_transform_open_fname(const char *fname) @@ -139,13 +166,13 @@ static const char *cql_lookup_property(cql_transform_t ct, struct cql_prop_entry *e; if (pat1 && pat2 && pat3) - sprintf (pattern, "%.39s.%.39s.%.39s", pat1, pat2, pat3); + sprintf(pattern, "%.39s.%.39s.%.39s", pat1, pat2, pat3); else if (pat1 && pat2) - sprintf (pattern, "%.39s.%.39s", pat1, pat2); + sprintf(pattern, "%.39s.%.39s", pat1, pat2); else if (pat1 && pat3) - sprintf (pattern, "%.39s.%.39s", pat1, pat3); + sprintf(pattern, "%.39s.%.39s", pat1, pat3); else if (pat1) - sprintf (pattern, "%.39s", pat1); + sprintf(pattern, "%.39s", pat1); else return 0; @@ -212,7 +239,7 @@ int cql_pr_attr_uri(cql_transform_t ct, const char *category, cp1++; if (cp1 - cp0 >= sizeof(buf)) break; - memcpy (buf, cp0, cp1 - cp0); + memcpy(buf, cp0, cp1 - cp0); buf[cp1-cp0] = 0; (*pr)("@attr ", client_data); @@ -258,9 +285,9 @@ int cql_pr_attr(cql_transform_t ct, const char *category, } -static void cql_pr_int (int val, - void (*pr)(const char *buf, void *client_data), - void *client_data) +static void cql_pr_int(int val, + void (*pr)(const char *buf, void *client_data), + void *client_data) { char buf[21]; /* enough characters to 2^64 */ sprintf(buf, "%d", val); @@ -280,55 +307,61 @@ static int cql_pr_prox(cql_transform_t ct, struct cql_node *mods, int proxrel = 2; /* less than or equal */ int unit = 2; /* word */ - while (mods != 0) { - char *name = mods->u.st.index; - char *term = mods->u.st.term; - char *relation = mods->u.st.relation; + while (mods) + { + const char *name = mods->u.st.index; + const char *term = mods->u.st.term; + const char *relation = mods->u.st.relation; if (!strcmp(name, "distance")) { distance = strtol(term, (char**) 0, 0); distance_defined = 1; - if (!strcmp(relation, "=")) { + if (!strcmp(relation, "=")) proxrel = 3; - } else if (!strcmp(relation, ">")) { + else if (!strcmp(relation, ">")) proxrel = 5; - } else if (!strcmp(relation, "<")) { + else if (!strcmp(relation, "<")) proxrel = 1; - } else if (!strcmp(relation, ">=")) { + else if (!strcmp(relation, ">=")) proxrel = 4; - } else if (!strcmp(relation, "<=")) { + else if (!strcmp(relation, "<=")) proxrel = 2; - } else if (!strcmp(relation, "<>")) { + else if (!strcmp(relation, "<>")) proxrel = 6; - } else { - ct->error = 40; /* Unsupported proximity relation */ + else + { + ct->error = YAZ_SRW_UNSUPP_PROX_RELATION; ct->addinfo = xstrdup(relation); return 0; } - } else if (!strcmp(name, "ordered")) { + } + else if (!strcmp(name, "ordered")) ordered = 1; - } else if (!strcmp(name, "unordered")) { + else if (!strcmp(name, "unordered")) ordered = 0; - } else if (!strcmp(name, "unit")) { - if (!strcmp(term, "word")) { + else if (!strcmp(name, "unit")) + { + if (!strcmp(term, "word")) unit = 2; - } else if (!strcmp(term, "sentence")) { + else if (!strcmp(term, "sentence")) unit = 3; - } else if (!strcmp(term, "paragraph")) { + else if (!strcmp(term, "paragraph")) unit = 4; - } else if (!strcmp(term, "element")) { + else if (!strcmp(term, "element")) unit = 8; - } else { - ct->error = 42; /* Unsupported proximity unit */ + else + { + ct->error = YAZ_SRW_UNSUPP_PROX_UNIT; ct->addinfo = xstrdup(term); return 0; } - } else { - ct->error = 46; /* Unsupported boolean modifier */ + } + else + { + ct->error = YAZ_SRW_UNSUPP_BOOLEAN_MODIFIER; ct->addinfo = xstrdup(name); return 0; } - mods = mods->u.st.modifiers; } @@ -394,27 +427,27 @@ void emit_term(cql_transform_t ct, if (length > 1 && term[0] == '^' && term[length-1] == '^') { cql_pr_attr(ct, "position", "firstAndLast", 0, - pr, client_data, 32); + pr, client_data, YAZ_SRW_ANCHORING_CHAR_IN_UNSUPP_POSITION); term++; length -= 2; } else if (term[0] == '^') { cql_pr_attr(ct, "position", "first", 0, - pr, client_data, 32); + pr, client_data, YAZ_SRW_ANCHORING_CHAR_IN_UNSUPP_POSITION); term++; length--; } else if (term[length-1] == '^') { cql_pr_attr(ct, "position", "last", 0, - pr, client_data, 32); + pr, client_data, YAZ_SRW_ANCHORING_CHAR_IN_UNSUPP_POSITION); length--; } else { cql_pr_attr(ct, "position", "any", 0, - pr, client_data, 32); + pr, client_data, YAZ_SRW_ANCHORING_CHAR_IN_UNSUPP_POSITION); } } @@ -464,7 +497,7 @@ void emit_term(cql_transform_t ct, */ int i; cql_pr_attr(ct, "truncation", "z3958", 0, - pr, client_data, 28); + pr, client_data, YAZ_SRW_MASKING_CHAR_UNSUPP); z3958_mem = (char *) xmalloc(length+1); for (i = 0; i < length; i++) { @@ -489,7 +522,7 @@ void emit_term(cql_transform_t ct, if (ns) { cql_pr_attr_uri(ct, "index", ns, cn->u.st.index, "serverChoice", - pr, client_data, 16); + pr, client_data, YAZ_SRW_UNSUPP_INDEX); } if (cn->u.st.modifiers) { @@ -497,7 +530,7 @@ void emit_term(cql_transform_t ct, for (; mod; mod = mod->u.st.modifiers) { cql_pr_attr(ct, "relationModifier", mod->u.st.index, 0, - pr, client_data, 20); + pr, client_data, YAZ_SRW_UNSUPP_RELATION_MODIFIER); } } @@ -607,38 +640,36 @@ void cql_transform_r(cql_transform_t ct, { if (!ct->error) { - ct->error = 15; + ct->error = YAZ_SRW_UNSUPP_CONTEXT_SET; ct->addinfo = 0; } } cql_pr_attr(ct, "always", 0, 0, pr, client_data, 0); - cql_pr_attr(ct, "relation", cn->u.st.relation, 0, pr, client_data, 19); + cql_pr_attr(ct, "relation", cn->u.st.relation, 0, pr, client_data, + YAZ_SRW_UNSUPP_RELATION); cql_pr_attr(ct, "structure", cn->u.st.relation, 0, - pr, client_data, 24); + pr, client_data, YAZ_SRW_UNSUPP_COMBI_OF_RELATION_AND_TERM); if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "all")) - { emit_wordlist(ct, cn, pr, client_data, "and"); - } else if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "any")) - { emit_wordlist(ct, cn, pr, client_data, "or"); - } else - { emit_terms(ct, cn, pr, client_data, "and"); - } break; case CQL_NODE_BOOL: (*pr)("@", client_data); (*pr)(cn->u.boolean.value, client_data); (*pr)(" ", client_data); mods = cn->u.boolean.modifiers; - if (!strcmp(cn->u.boolean.value, "prox")) { + if (!strcmp(cn->u.boolean.value, "prox")) + { if (!cql_pr_prox(ct, mods, pr, client_data)) return; - } else if (mods) { + } + else if (mods) + { /* Boolean modifiers other than on proximity not supported */ - ct->error = 46; /* SRW diag: "Unsupported boolean modifier" */ + ct->error = YAZ_SRW_UNSUPP_BOOLEAN_MODIFIER; ct->addinfo = xstrdup(mods->u.st.index); return; } @@ -653,8 +684,7 @@ void cql_transform_r(cql_transform_t ct, } } -int cql_transform(cql_transform_t ct, - struct cql_node *cn, +int cql_transform(cql_transform_t ct, struct cql_node *cn, void (*pr)(const char *buf, void *client_data), void *client_data) { @@ -662,8 +692,7 @@ int cql_transform(cql_transform_t ct, NMEM nmem = nmem_create(); ct->error = 0; - if (ct->addinfo) - xfree (ct->addinfo); + xfree(ct->addinfo); ct->addinfo = 0; for (e = ct->entry; e ; e = e->next) @@ -673,7 +702,7 @@ int cql_transform(cql_transform_t ct, else if (!cql_strcmp(e->pattern, "set")) cql_apply_prefix(nmem, cn, 0, e->value); } - cql_transform_r (ct, cn, pr, client_data); + cql_transform_r(ct, cn, pr, client_data); nmem_destroy(nmem); return ct->error; } @@ -684,8 +713,7 @@ int cql_transform_FILE(cql_transform_t ct, struct cql_node *cn, FILE *f) return cql_transform(ct, cn, cql_fputs, f); } -int cql_transform_buf(cql_transform_t ct, struct cql_node *cn, - char *out, int max) +int cql_transform_buf(cql_transform_t ct, struct cql_node *cn, char *out, int max) { struct cql_buf_write_info info; int r; @@ -714,6 +742,14 @@ int cql_transform_error(cql_transform_t ct, const char **addinfo) *addinfo = ct->addinfo; return ct->error; } + +void cql_transform_set_error(cql_transform_t ct, int error, const char *addinfo) +{ + xfree(ct->addinfo); + ct->addinfo = addinfo ? xstrdup(addinfo) : 0; + ct->error = error; +} + /* * Local variables: * c-basic-offset: 4