projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment.
[yaz-moved-to-github.git]
/
src
/
cqltransform.c
diff --git
a/src/cqltransform.c
b/src/cqltransform.c
index
7008af4
..
5a4025e
100644
(file)
--- a/
src/cqltransform.c
+++ b/
src/cqltransform.c
@@
-1,4
+1,4
@@
-/* $Id: cqltransform.c,v 1.2 2003-12-18 16:42:52 mike Exp $
+/* $Id: cqltransform.c,v 1.5 2003-12-18 17:00:55 mike Exp $
Copyright (C) 2002-2003
Index Data Aps
Copyright (C) 2002-2003
Index Data Aps
@@
-315,7
+315,7
@@
static const char *cql_get_ns(cql_transform_t ct,
}
return 0;
}
}
return 0;
}
- /* 4. lookup qualifier.prefix. */
+ /* 4. lookup index.prefix. */
cp = cn->u.st.index;
cp_dot = strchr(cp, '.');
cp = cn->u.st.index;
cp_dot = strchr(cp, '.');
@@
-345,7
+345,8
@@
void cql_transform_r(cql_transform_t ct,
char n_full[64];
sprintf (n_full, "%.20s.%.40s", n_prefix, n_suffix);
char n_full[64];
sprintf (n_full, "%.20s.%.40s", n_prefix, n_suffix);
- if (!strcmp(ns, "http://www.loc.gov/zing/cql/srw-indexes/v1.0/")
+ if ((!strcmp(ns, "http://www.loc.gov/zing/cql/context-sets/cql/v1.1/") ||
+ !strcmp(ns, "http://www.loc.gov/zing/cql/srw-indexes/v1.0/"))
&& !strcmp(n_suffix, "resultSet"))
{
(*pr)("@set \"", client_data);
&& !strcmp(n_suffix, "resultSet"))
{
(*pr)("@set \"", client_data);
@@
-353,11
+354,13
@@
void cql_transform_r(cql_transform_t ct,
(*pr)("\" ", client_data);
return ;
}
(*pr)("\" ", client_data);
return ;
}
- if (!cql_pr_attr(ct, "index.", n_full, "srw.serverChoice",
+ /* ### It would be nice if this could fall back to whichever
+ of cql.serverChoice and srw.serverChoice is defined */
+ if (!cql_pr_attr(ct, "index.", n_full, "cql.serverChoice",
pr, client_data, 16)) {
/* No index.foo; reset error and fall back to qualifier.foo */
if (ct->error == 16) ct->error = 0;
pr, client_data, 16)) {
/* No index.foo; reset error and fall back to qualifier.foo */
if (ct->error == 16) ct->error = 0;
- cql_pr_attr(ct, "qualifier.", n_full, "srw.serverChoice",
+ cql_pr_attr(ct, "qualifier.", n_full, "cql.serverChoice",
pr, client_data, 16);
}
}
pr, client_data, 16);
}
}