static const char *cql_lookup_property(cql_transform_t ct,
const char *pat1, const char *pat2,
static const char *cql_lookup_property(cql_transform_t ct,
const char *pat1, const char *pat2,
- const char *uri, const char *val, const char *default_val,
- void (*pr)(const char *buf, void *client_data),
- void *client_data,
- int errcode)
+ const char *uri, const char *val, const char *default_val,
+ void (*pr)(const char *buf, void *client_data),
+ void *client_data,
+ int errcode)
- struct cql_prop_entry *e;
-
- for (e = ct->entry; e; e = e->next)
- if (!memcmp(e->pattern, "set.", 4) && e->value &&
- !strcmp(e->value, uri))
- {
- prefix = e->pattern+4;
- break;
- }
- /* must have a prefix now - if not it's an error */
+ struct cql_prop_entry *e;
+
+ for (e = ct->entry; e; e = e->next)
+ if (!memcmp(e->pattern, "set.", 4) && e->value &&
+ !strcmp(e->value, uri))
+ {
+ prefix = e->pattern+4;
+ break;
+ }
+ /* must have a prefix now - if not it's an error */
- if (!res)
- res = cql_lookup_property(ct, category, prefix, eval);
- if (!res)
- res = cql_lookup_property(ct, category, prefix, "*");
+ if (!res)
+ res = cql_lookup_property(ct, category, prefix, eval);
+ if (!res)
+ res = cql_lookup_property(ct, category, prefix, "*");
- const char *val, const char *default_val,
- void (*pr)(const char *buf, void *client_data),
- void *client_data,
- int errcode)
+ const char *val, const char *default_val,
+ void (*pr)(const char *buf, void *client_data),
+ void *client_data,
+ int errcode)
{
return cql_pr_attr_uri(ct, category, 0 /* uri */,
{
return cql_pr_attr_uri(ct, category, 0 /* uri */,
- val, default_val, pr, client_data, errcode);
+ val, default_val, pr, client_data, errcode);
- current = (const char *) memchr(term, *whichp, length);
- if (current != 0 && (best == 0 || current < best))
- best = current;
+ current = (const char *) memchr(term, *whichp, length);
+ if (current != 0 && (best == 0 || current < best))
+ best = current;
cql_pr_attr(ct, "position", "first", 0,
pr, client_data, 32);
term++;
cql_pr_attr(ct, "position", "first", 0,
pr, client_data, 32);
term++;
- /* Check for well-known globbing patterns that represent
- * simple truncation attributes as expected by, for example,
- * Bath-compliant server. If we find such a pattern but
- * there's no mapping for it, that's fine: we just use a
- * general pattern-matching attribute.
- */
+ /* Check for well-known globbing patterns that represent
+ * simple truncation attributes as expected by, for example,
+ * Bath-compliant server. If we find such a pattern but
+ * there's no mapping for it, that's fine: we just use a
+ * general pattern-matching attribute.
+ */
cql_pr_attr(ct, "truncation", "both", 0,
cql_pr_attr(ct, "truncation", "both", 0,
- wcchar(term+1, length-1) == 0 &&
- cql_pr_attr(ct, "truncation", "left", 0,
- pr, client_data, 0)) {
- term++;
- length--;
+ wcchar(term+1, length-1) == 0 &&
+ cql_pr_attr(ct, "truncation", "left", 0,
+ pr, client_data, 0)) {
+ term++;
+ length--;
- wcchar(term, length-1) == 0 &&
- cql_pr_attr(ct, "truncation", "right", 0,
- pr, client_data, 0)) {
- length--;
+ wcchar(term, length-1) == 0 &&
+ cql_pr_attr(ct, "truncation", "right", 0,
+ pr, client_data, 0)) {
+ length--;
- /* We have one or more wildcard characters, but not in a
- * way that can be dealt with using only the standard
- * left-, right- and both-truncation attributes. We need
- * to translate the pattern into a Z39.58-type pattern,
- * which has been supported in BIB-1 since 1996. If
- * there's no configuration element for "truncation.z3958"
- * we indicate this as error 28 "Masking character not
- * supported".
- */
- int i;
- char *mem;
+ /* We have one or more wildcard characters, but not in a
+ * way that can be dealt with using only the standard
+ * left-, right- and both-truncation attributes. We need
+ * to translate the pattern into a Z39.58-type pattern,
+ * which has been supported in BIB-1 since 1996. If
+ * there's no configuration element for "truncation.z3958"
+ * we indicate this as error 28 "Masking character not
+ * supported".
+ */
+ int i;
+ char *mem;
cql_pr_attr(ct, "truncation", "z3958", 0,
pr, client_data, 28);
cql_pr_attr(ct, "truncation", "z3958", 0,
pr, client_data, 28);
cql_pr_attr(ct, "truncation", "none", 0,
pr, client_data, 0);
}
cql_pr_attr(ct, "truncation", "none", 0,
pr, client_data, 0);
}
{
(*pr)("@set \"", client_data);
(*pr)(cn->u.st.term, client_data);
(*pr)("\" ", client_data);
return ;
}
{
(*pr)("@set \"", client_data);
(*pr)(cn->u.st.term, client_data);
(*pr)("\" ", client_data);
return ;
}
- cql_pr_attr_uri(ct, "index", ns,
- cn->u.st.index, "serverChoice",
- pr, client_data, 16);
+ cql_pr_attr_uri(ct, "index", ns,
+ cn->u.st.index, "serverChoice",
+ pr, client_data, 16);
+ }
+ else
+ {
+ if (!ct->error)
+ {
+ ct->error = 15;
+ ct->addinfo = 0;
+ }
cql_pr_attr(ct, "relation", "eq", "scr",
pr, client_data, 19);
cql_pr_attr(ct, "relation", "eq", "scr",
pr, client_data, 19);
cql_pr_attr(ct, "relation", "le", "scr",
pr, client_data, 19);
cql_pr_attr(ct, "relation", "le", "scr",
pr, client_data, 19);
cql_pr_attr(ct, "relation", "ge", "scr",
pr, client_data, 19);
else
cql_pr_attr(ct, "relation", "ge", "scr",
pr, client_data, 19);
else
}
cql_pr_attr(ct, "structure", cn->u.st.relation, 0,
pr, client_data, 24);
}
cql_pr_attr(ct, "structure", cn->u.st.relation, 0,
pr, client_data, 24);
{
emit_wordlist(ct, cn, pr, client_data, "and");
}
{
emit_wordlist(ct, cn, pr, client_data, "and");
}
{
emit_wordlist(ct, cn, pr, client_data, "or");
}
{
emit_wordlist(ct, cn, pr, client_data, "or");
}
- if (!memcmp(e->pattern, "set.", 4))
- cql_apply_prefix(nmem, cn, e->pattern+4, e->value);
- else if (!strcmp(e->pattern, "set"))
- cql_apply_prefix(nmem, cn, 0, e->value);
+ if (!cql_strncmp(e->pattern, "set.", 4))
+ cql_apply_prefix(nmem, cn, e->pattern+4, e->value);
+ else if (!cql_strcmp(e->pattern, "set"))
+ cql_apply_prefix(nmem, cn, 0, e->value);
}
cql_transform_r (ct, cn, pr, client_data);
nmem_destroy(nmem);
}
cql_transform_r (ct, cn, pr, client_data);
nmem_destroy(nmem);