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
Omit unnecessary warnings in ztest sample code.
[yaz-moved-to-github.git]
/
src
/
cqltransform.c
diff --git
a/src/cqltransform.c
b/src/cqltransform.c
index
70c45e7
..
9b2e18d
100644
(file)
--- a/
src/cqltransform.c
+++ b/
src/cqltransform.c
@@
-1,4
+1,4
@@
-/* $Id: cqltransform.c,v 1.16 2005-06-27 22:03:59 adam Exp $
+/* $Id: cqltransform.c,v 1.20 2006-03-10 17:18:09 mike Exp $
Copyright (C) 1995-2005, Index Data ApS
Index Data Aps
Copyright (C) 1995-2005, Index Data ApS
Index Data Aps
@@
-390,9
+390,6
@@
void cql_transform_r(cql_transform_t ct,
(*pr)("\" ", client_data);
return ;
}
(*pr)("\" ", client_data);
return ;
}
- cql_pr_attr_uri(ct, "index", ns,
- cn->u.st.index, "serverChoice",
- pr, client_data, 16);
}
else
{
}
else
{
@@
-402,6
+399,7
@@
void cql_transform_r(cql_transform_t ct,
ct->addinfo = 0;
}
}
ct->addinfo = 0;
}
}
+ cql_pr_attr(ct, "always", 0, 0, pr, client_data, 0);
if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "="))
cql_pr_attr(ct, "relation", "eq", "scr",
pr, client_data, 19);
if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "="))
cql_pr_attr(ct, "relation", "eq", "scr",
pr, client_data, 19);
@@
-425,6
+423,11
@@
void cql_transform_r(cql_transform_t ct,
}
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);
+ 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");
if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "all"))
{
emit_wordlist(ct, cn, pr, client_data, "and");
@@
-446,6
+449,11
@@
void cql_transform_r(cql_transform_t ct,
cql_transform_r(ct, cn->u.boolean.left, pr, client_data);
cql_transform_r(ct, cn->u.boolean.right, pr, client_data);
cql_transform_r(ct, cn->u.boolean.left, pr, client_data);
cql_transform_r(ct, cn->u.boolean.right, pr, client_data);
+ break;
+
+ default:
+ fprintf(stderr, "Fatal: impossible CQL node-type %d\n", cn->which);
+ abort();
}
}
}
}