-/* $Id: cqltransform.c,v 1.21 2006-03-20 14:56:40 mike Exp $
- Copyright (C) 1995-2005, Index Data ApS
+/* $Id: cqltransform.c,v 1.28 2007-03-29 11:14:11 mike Exp $
+ Copyright (C) 1995-2007, Index Data ApS
Index Data Aps
This file is part of the YAZ toolkit.
/**
* \file cqltransform.c
* \brief Implements CQL transform (CQL to RPN conversion).
+ *
+ * Evaluation order of rules:
+ *
+ * always
+ * relation
+ * structure
+ * position
+ * truncation
+ * index
+ * relationModifier
*/
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <yaz/cql.h>
#include <yaz/xmalloc.h>
+#include <yaz/diagsrw.h>
struct cql_prop_entry {
char *pattern;
{
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=\r\n#", *cp))
+
+ while (*cp && strchr(" \t", *cp))
+ cp++;
+ cp_pattern_start = cp;
+
+ while (*cp && !strchr(" \t\r\n=#", *cp))
cp++;
cp_pattern_end = cp;
- if (cp == line)
+ if (cp == cp_pattern_start)
continue;
- while (*cp && strchr(" \t\r\n", *cp))
+ while (*cp && strchr(" \t", *cp))
cp++;
if (*cp != '=')
- continue;
+ {
+ *pp = 0;
+ cql_transform_close(ct);
+ return 0;
+ }
cp++;
while (*cp && strchr(" \t\r\n", *cp))
cp++;
cp_value_start = cp;
- if (!(cp_value_end = strchr(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 - line + 1);
- memcpy ((*pp)->pattern, line, cp_pattern_end - line);
- (*pp)->pattern[cp_pattern_end-line] = 0;
+ (*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);
+ (*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)->value[cp_value_end - cp_value_start] = '\0';
pp = &(*pp)->next;
}
*pp = 0;
const char *cp0 = res, *cp1;
while ((cp1 = strchr(cp0, '=')))
{
+ int i;
while (*cp1 && *cp1 != ' ')
cp1++;
if (cp1 - cp0 >= sizeof(buf))
memcpy (buf, cp0, cp1 - cp0);
buf[cp1-cp0] = 0;
(*pr)("@attr ", client_data);
- (*pr)(buf, client_data);
+
+ for (i = 0; buf[i]; i++)
+ {
+ if (buf[i] == '*')
+ (*pr)(eval, client_data);
+ else
+ {
+ char tmp[2];
+ tmp[0] = buf[i];
+ tmp[1] = '\0';
+ (*pr)(tmp, client_data);
+ }
+ }
(*pr)(" ", client_data);
cp0 = cp1;
while (*cp0 == ' ')
}
+/* ### checks for CQL relation-name rather than Type-1 attribute */
+static int has_modifier(struct cql_node *cn, const char *name) {
+ struct cql_node *mod;
+ for (mod = cn->u.st.modifiers; mod != 0; mod = mod->u.st.modifiers) {
+ if (!strcmp(mod->u.st.index, name))
+ return 1;
+ }
+
+ return 0;
+}
+
+
void emit_term(cql_transform_t ct,
+ struct cql_node *cn,
const char *term, int length,
void (*pr)(const char *buf, void *client_data),
void *client_data)
{
int i;
- if (length > 0)
+ const char *ns = cn->u.st.index_uri;
+ int process_term = !has_modifier(cn, "regexp");
+
+ assert(cn->which == CQL_NODE_ST);
+
+ if (process_term && length > 0)
{
if (length > 1 && term[0] == '^' && term[length-1] == '^')
{
}
}
- if (length > 0)
+ if (process_term && length > 0)
{
/* Check for well-known globbing patterns that represent
* simple truncation attributes as expected by, for example,
pr, client_data, 0);
}
}
+ if (ns) {
+ cql_pr_attr_uri(ct, "index", ns,
+ cn->u.st.index, "serverChoice",
+ pr, client_data, 16);
+ }
+ if (cn->u.st.modifiers)
+ {
+ struct cql_node *mod = cn->u.st.modifiers;
+ for (; mod; mod = mod->u.st.modifiers)
+ {
+ cql_pr_attr(ct, "relationModifier", mod->u.st.index, 0,
+ pr, client_data, 20);
+ }
+ }
(*pr)("\"", client_data);
for (i = 0; i<length; i++)
{
- char buf[2];
- buf[0] = term[i];
- buf[1] = 0;
- (*pr)(buf, client_data);
+ /* pr(int) each character */
+ char buf[3];
+ const char *cp;
+
+ buf[1] = term[i];
+ buf[2] = 0;
+ /* do we have to escape this char? */
+ if (buf[1] == '"')
+ {
+ buf[0] = '\\';
+ cp = buf;
+ }
+ else
+ cp = buf+1;
+ (*pr)(cp, client_data);
}
(*pr)("\" ", client_data);
}
(*pr)("@", client_data);
(*pr)(op, client_data);
(*pr)(" ", client_data);
- emit_term(ct, last_term, last_length, pr, client_data);
+ emit_term(ct, cn, last_term, last_length, pr, client_data);
}
last_term = cp0;
if (cp1)
cp0 = cp1;
}
if (last_term)
- emit_term(ct, last_term, last_length, pr, client_data);
+ emit_term(ct, cn, last_term, last_length, pr, client_data);
}
void cql_transform_r(cql_transform_t ct,
else
cql_pr_attr(ct, "relation", cn->u.st.relation, "eq",
pr, client_data, 19);
- if (cn->u.st.modifiers)
- {
- struct cql_node *mod = cn->u.st.modifiers;
- for (; mod; mod = mod->u.st.modifiers)
- {
- cql_pr_attr(ct, "relationModifier", mod->u.st.index, 0,
- pr, client_data, 20);
- }
- }
cql_pr_attr(ct, "structure", cn->u.st.relation, 0,
pr, client_data, 24);
- if (ns) {
- cql_pr_attr_uri(ct, "index", ns,
- cn->u.st.index, "serverChoice",
- pr, client_data, 16);
- }
if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "all"))
{
emit_wordlist(ct, cn, pr, client_data, "and");
}
else
{
- emit_term(ct, cn->u.st.term, strlen(cn->u.st.term),
+ emit_term(ct, cn, cn->u.st.term, strlen(cn->u.st.term),
pr, client_data);
}
break;
info.max = max;
info.buf = out;
r = cql_transform(ct, cn, cql_buf_write_handler, &info);
+ if (info.off < 0) {
+ /* Attempt to write past end of buffer. For some reason, this
+ SRW diagnostic is deprecated, but it's so perfect for our
+ purposes that it would be stupid not to use it. */
+ char numbuf[30];
+ ct->error = YAZ_SRW_TOO_MANY_CHARS_IN_QUERY;
+ sprintf(numbuf, "%ld", (long) info.max);
+ ct->addinfo = xstrdup(numbuf);
+ return -1;
+ }
if (info.off >= 0)
info.buf[info.off] = '\0';
return r;