* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.22 2003-02-17 22:35:48 adam Exp $
+ * $Id: zoom-c.c,v 1.25 2003-02-19 15:22:11 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
else if (addinfo)
c->addinfo = xstrdup(addinfo);
if (error)
- yaz_log(LOG_LOG, "Error %s %s:%d %s %s",
+ yaz_log(LOG_DEBUG, "Error %s %s:%d %s %s",
c->host_port ? c->host_port : "<>", dset, error,
addinfo ? addinfo : "",
addinfo2 ? addinfo2 : "");
static void set_HTTP_error (ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
- return set_dset_error(c, error, "HTTP", addinfo, addinfo2);
+ set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
static void set_ZOOM_error (ZOOM_connection c, int error,
const char *addinfo)
{
- return set_dset_error(c, error, "ZOOM", addinfo, 0);
+ set_dset_error(c, error, "ZOOM", addinfo, 0);
}
static void clear_error (ZOOM_connection c)
if (resultset->z_query->which == Z_Query_type_104
&& resultset->z_query->u.type_104->which == Z_External_CQL)
sr->u.request->query = resultset->z_query->u.type_104->u.cql;
- else if (resultset->z_query->which == Z_Query_type_1)
- {
- set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, "Type-1");
+ else if (resultset->z_query->which == Z_Query_type_1 &&
+ resultset->z_query->u.type_1)
+ {
+ set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0);
return zoom_complete;
}
else
resultset->size = 0;
- yaz_log(LOG_LOG, "got SRW response OK");
+ yaz_log(LOG_DEBUG, "got SRW response OK");
if (res->numberOfRecords)
resultset->size = *res->numberOfRecords;
npr->u.databaseRecord->u.octet_aligned->size =
res->records[i].recordData_len;
record_cache_add (resultset, npr, pos);
- yaz_log(LOG_LOG, "add SRW record to cache to pos %d", pos);
}
if (res->num_diagnostics > 0)
{
else if (!strcmp(c->diagset, "Bib-1"))
*cp = ZOOM_diag_str(error);
else if (!strcmp(c->diagset, "SRW"))
- *cp = yaz_srw_error_str(c->error);
+ *cp = yaz_diag_srw_str(c->error);
else
*cp = "Unknown error and diagnostic set";
}