* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.58 2005-12-20 22:24:05 mike Exp $
+ * $Id: zoom-c.c,v 1.62 2005-12-21 16:41:36 mike Exp $
*/
/**
* \file zoom-c.c
static void clear_error (ZOOM_connection c)
{
-
+ /*
+ * If an error is tied to an operation then it's ok to clear: for
+ * example, a diagnostic returned from a search is cleared by a
+ * subsequent search. However, problems such as Connection Lost
+ * or Init Refused are not cleared, because they are not
+ * recoverable: doing another search doesn't help.
+ */
switch (c->error)
{
case ZOOM_ERROR_CONNECT:
return 0;
}
+/*
+ * Translate the CQL string client-side into RPN which is passed to
+ * the server. This is useful for server's that don't themselves
+ * support CQL, for which ZOOM_query_cql() is useless. `conn' is used
+ * only as a place to stash diagnostics if compilation fails; if this
+ * information is not needed, a null pointer may be used.
+ */
+ZOOM_API(int)
+ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
+{
+ char *rpn;
+ int ret;
+
+ yaz_log(log_details, "%p ZOOM_query_cql2rpn str=%s conn=%p", s, str, conn);
+ if (conn == 0)
+ conn = ZOOM_connection_create(0);
+
+ if ((rpn = cql2pqf(conn, str)) == 0)
+ return -1;
+
+ ret = ZOOM_query_prefix(s, rpn);
+ xfree(rpn);
+ return ret;
+}
+
ZOOM_API(int)
ZOOM_query_sortby(ZOOM_query s, const char *criteria)
{
ZOOM_options_get(c->options, "implementationName"),
odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
- version = odr_strdup(c->odr_out, "$Revision: 1.58 $");
+ version = odr_strdup(c->odr_out, "$Revision: 1.62 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion = odr_prepend(c->odr_out,
char pqfbuf[512];
parser = cql_parser_create();
- printf("*** got CQL parser %p\n", parser);
if ((error = cql_parser_string(parser, cql)) != 0) {
cql_parser_destroy(parser);
set_ZOOM_error(c, ZOOM_ERROR_CQL_PARSE, cql);
}
node = cql_parser_result(parser);
- printf("*** got CQL node %p\n", node);
- cql_parser_destroy(parser);
- printf("*** destroyed parser\n");
+ /* ### Do not call cql_parser_destroy() yet: it destroys `node'! */
cqlfile = ZOOM_connection_option_get(c, "cqlfile");
- printf("*** cqlfile is %p\n", cqlfile);
if (cqlfile == 0) {
- printf("*** cqlfile is null\n");
+ cql_parser_destroy(parser);
cql_node_destroy(node);
- printf("*** destroyed node\n");
set_ZOOM_error(c, ZOOM_ERROR_CQL_TRANSFORM, "no CQL transform file");
- printf("*** set ZOOM_error\n");
return 0;
}
- printf("*** got CQL file %s\n", cqlfile);
if ((trans = cql_transform_open_fname(cqlfile)) == 0) {
char buf[512];
+ cql_parser_destroy(parser);
cql_node_destroy(node);
sprintf(buf, "can't open CQL transform file '%.200s': %.200s",
cqlfile, strerror(errno));
}
error = cql_transform_buf(trans, node, pqfbuf, sizeof pqfbuf);
+ cql_parser_destroy(parser);
cql_node_destroy(node);
if (error != 0) {
char buf[512];