* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.67 2006-02-27 21:31:33 adam Exp $
+ * $Id: seshigh.c,v 1.98 2006-09-06 09:35:41 adam Exp $
*/
/**
* \file seshigh.c
#include <unistd.h>
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#endif
#include <yaz/comstack.h>
#include "eventl.h"
#include "session.h"
+#include "mime.h"
#include <yaz/proto.h>
#include <yaz/oid.h>
#include <yaz/log.h>
/* dynamic logging levels */
static int logbits_set = 0;
-static int log_session = 0;
+static int log_session = 0; /* one-line logs for session */
+static int log_sessiondetail = 0; /* more detailed stuff */
static int log_request = 0; /* one-line logs for requests */
static int log_requestdetail = 0; /* more detailed stuff */
{
logbits_set = 1;
log_session = yaz_log_module_level("session");
- log_request = yaz_log_module_level("request");
+ log_sessiondetail = yaz_log_module_level("sessiondetail");
+ log_request = yaz_log_module_level("request");
log_requestdetail = yaz_log_module_level("requestdetail");
}
}
+
+
static void wr_diag(WRBUF w, int error, const char *addinfo)
{
- wrbuf_printf(w, "ERROR [%d] %s%s%s",
- error, diagbib1_str(error),
- addinfo ? "--" : "", addinfo ? addinfo : "");
+ wrbuf_printf(w, "ERROR %d+", error);
+ wrbuf_puts_replace_char(w, diagbib1_str(error), ' ', '_');
+ if (addinfo){
+ wrbuf_puts(w, "+");
+ wrbuf_puts_replace_char(w, addinfo, ' ', '_');
+ }
+
+ wrbuf_puts(w, " ");
}
request_initq(&anew->incoming);
request_initq(&anew->outgoing);
anew->proto = cs_getproto(link);
- anew->cql_transform = 0;
- anew->server_node_ptr = 0;
+ anew->server = 0;
return anew;
}
}
else
{
- yaz_log(log_session, "Session idle too long. Sending close.");
+ yaz_log(log_sessiondetail,
+ "Session idle too long. Sending close.");
do_close(assoc, Z_Close_lackOfActivity, 0);
}
return;
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
- yaz_log(log_session, "Connection closed - end of session");
+ yaz_log(log_sessiondetail, "Connection closed - end of session");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
return;
}
assoc->cs_get_mask = EVENT_INPUT;
- if ((res = cs_get(conn, &assoc->input_buffer,
- &assoc->input_buffer_len)) <= 0)
+ res = cs_get(conn, &assoc->input_buffer,
+ &assoc->input_buffer_len);
+ if (res < 0 && cs_errno(conn) == CSBUFSIZE)
+ {
+ yaz_log(log_session, "Connection error: %s res=%d",
+ cs_errmsg(cs_errno(conn)), res);
+ req = request_get(&assoc->incoming); /* get a new request */
+ do_close_req(assoc, Z_Close_protocolError,
+ "Incoming package too large", req);
+ return;
+ }
+ else if (res <= 0)
{
- yaz_log(log_session, "Connection closed by client");
+ yaz_log(log_sessiondetail, "Connection closed by client");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] "
- "[near byte %d] ",
+ "[near byte %ld] ",
odr_errmsg(odr_geterror(assoc->decode)),
odr_getelement(assoc->decode),
- odr_offset(assoc->decode));
+ (long) odr_offset(assoc->decode));
if (assoc->decode->error != OHTTP)
{
yaz_log(YLOG_WARN, "PDU dump:");
odr_dumpBER(yaz_log_file(), assoc->input_buffer, res);
request_release(req);
- do_close(assoc, Z_Close_protocolError,"Malformed package");
+ do_close(assoc, Z_Close_protocolError, "Malformed package");
}
else
{
switch (res = cs_put(conn, req->response, req->len_response))
{
case -1:
- yaz_log(log_session, "Connection closed by client");
+ yaz_log(log_sessiondetail, "Connection closed by client");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name);
}
-static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num)
+static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_SRW_PDU *sr)
{
statserv_options_block *cb = statserv_getcontrol();
if (!assoc->init)
Z_External *ce;
bend_initresult *binitres;
- yaz_log(YLOG_LOG, "srw_bend_init config=%s", cb->configname);
+ yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname);
assoc_init_reset(assoc);
- assoc->maximumRecordSize = 3000000;
- assoc->preferredMessageSize = 3000000;
+ if (sr->username)
+ {
+ Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth));
+ int len;
+
+ len = strlen(sr->username) + 1;
+ if (sr->password)
+ len += strlen(sr->password) + 2;
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = odr_malloc(assoc->decode, len);
+ strcpy(auth->u.open, sr->username);
+ if (sr->password && *sr->password)
+ {
+ strcat(auth->u.open, "/");
+ strcat(auth->u.open, sr->password);
+ }
+ assoc->init->auth = auth;
+ }
+
#if 1
ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1);
assoc->init->charneg_request = ce->u.charNeg3;
return 0;
}
assoc->backend = binitres->handle;
+ assoc->init->auth = 0;
if (binitres->errcode)
{
+ int srw_code = yaz_diag_bib1_to_srw(binitres->errcode);
assoc->state = ASSOC_DEAD;
- yaz_add_srw_diagnostic(assoc->encode, d, num, binitres->errcode,
+ yaz_add_srw_diagnostic(assoc->encode, d, num, srw_code,
binitres->errstring);
return 0;
}
return 1;
}
+static const char *get_esn(Z_RecordComposition *comp)
+{
+ if (comp && comp->which == Z_RecordComp_complex)
+ {
+ if (comp->u.complex->generic
+ && comp->u.complex->generic->elementSpec
+ && (comp->u.complex->generic->elementSpec->which ==
+ Z_ElementSpec_elementSetName))
+ return comp->u.complex->generic->elementSpec->u.elementSetName;
+ }
+ else if (comp && comp->which == Z_RecordComp_simple &&
+ comp->u.simple->which == Z_ElementSetNames_generic)
+ return comp->u.simple->u.generic;
+ return 0;
+}
+
+static void set_esn(Z_RecordComposition **comp_p, const char *esn, NMEM nmem)
+{
+ Z_RecordComposition *comp = nmem_malloc(nmem, sizeof(*comp));
+
+ comp->which = Z_RecordComp_simple;
+ comp->u.simple = nmem_malloc(nmem, sizeof(*comp->u.simple));
+ comp->u.simple->which = Z_ElementSetNames_generic;
+ comp->u.simple->u.generic = nmem_strdup(nmem, esn);
+ *comp_p = comp;
+}
+
+static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
+{
+#if YAZ_HAVE_XML2
+ yaz_record_conv_t rc = 0;
+ const char *match_schema = 0;
+ int *match_syntax = 0;
+
+ if (assoc->server)
+ {
+ int r;
+ const char *input_schema = get_esn(rr->comp);
+ Odr_oid *input_syntax_raw = rr->request_format_raw;
+
+ const char *backend_schema = 0;
+ Odr_oid *backend_syntax = 0;
+
+ r = yaz_retrieval_request(assoc->server->retrieval,
+ input_schema,
+ input_syntax_raw,
+ &match_schema,
+ &match_syntax,
+ &rc,
+ &backend_schema,
+ &backend_syntax);
+ if (r == -1) /* error ? */
+ {
+ const char *details = yaz_retrieval_get_error(
+ assoc->server->retrieval);
+
+ rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ return -1;
+ }
+ else if (r == 1 || r == 3)
+ {
+ const char *details = input_schema;
+ rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ return -1;
+ }
+ else if (r == 2)
+ {
+ rr->errcode = YAZ_BIB1_RECORD_SYNTAX_UNSUPP;
+ if (input_syntax_raw)
+ {
+ char oidbuf[OID_STR_MAX];
+ oid_to_dotstring(input_syntax_raw, oidbuf);
+ rr->errstring = odr_strdup(rr->stream, oidbuf);
+ }
+ return -1;
+ }
+ if (backend_schema)
+ {
+ set_esn(&rr->comp, backend_schema, rr->stream->mem);
+ }
+ if (backend_syntax)
+ {
+ oident *oident_syntax = oid_getentbyoid(backend_syntax);
+
+ rr->request_format_raw = backend_syntax;
+
+ if (oident_syntax)
+ rr->request_format = oident_syntax->value;
+ else
+ rr->request_format = VAL_NONE;
+ }
+ }
+ (*assoc->init->bend_fetch)(assoc->backend, rr);
+ if (rc && rr->record && rr->errcode == 0 && rr->len > 0)
+ { /* post conversion must take place .. */
+ WRBUF output_record = wrbuf_alloc();
+ int r = yaz_record_conv_record(rc, rr->record, rr->len, output_record);
+ if (r)
+ {
+ const char *details = yaz_record_conv_get_error(rc);
+ rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
+ if (details)
+ rr->errstring = odr_strdup(rr->stream, details);
+ }
+ else
+ {
+ rr->len = wrbuf_len(output_record);
+ rr->record = odr_malloc(rr->stream, rr->len);
+ memcpy(rr->record, wrbuf_buf(output_record), rr->len);
+ }
+ wrbuf_free(output_record, 1);
+ }
+ if (match_syntax)
+ {
+ struct oident *oi = oid_getentbyoid(match_syntax);
+ rr->output_format = oi ? oi->value : VAL_NONE;
+ rr->output_format_raw = match_syntax;
+ }
+ if (match_schema)
+ rr->schema = odr_strdup(rr->stream, match_schema);
+ return 0;
+#else
+ (*assoc->init->bend_fetch)(assoc->backend, rr);
+#endif
+}
+
static int srw_bend_fetch(association *assoc, int pos,
Z_SRW_searchRetrieveRequest *srw_req,
- Z_SRW_record *record)
+ Z_SRW_record *record,
+ const char **addinfo)
{
bend_fetch_rr rr;
ODR o = assoc->encode;
rr.referenceId = 0;
rr.request_format = VAL_TEXT_XML;
rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode,
- CLASS_TRANSYN,
+ CLASS_RECSYN,
VAL_TEXT_XML);
rr.comp = (Z_RecordComposition *)
odr_malloc(assoc->decode, sizeof(*rr.comp));
rr.len = 0;
rr.record = 0;
rr.last_in_set = 0;
- rr.output_format = VAL_TEXT_XML;
- rr.output_format_raw = 0;
rr.errcode = 0;
rr.errstring = 0;
rr.surrogate_flag = 0;
if (!assoc->init->bend_fetch)
return 1;
- (*assoc->init->bend_fetch)(assoc->backend, &rr);
+ retrieve_fetch(assoc, &rr);
if (rr.errcode && rr.surrogate_flag)
{
else
record->recordSchema = 0;
}
- return rr.errcode;
+ if (rr.errcode)
+ {
+ *addinfo = rr.errstring;
+ return rr.errcode;
+ }
+ return 0;
}
static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
int r;
int srw_errcode = 0;
const char *add = 0;
- char rpn_buf[512];
+ char rpn_buf[5120];
r = cql_parser_string(cp, cql);
if (r)
}
static void srw_bend_search(association *assoc, request *req,
- Z_SRW_searchRetrieveRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_searchRetrieveResponse *srw_res,
int *http_code)
{
int srw_error = 0;
Z_External *ext;
+ Z_SRW_searchRetrieveRequest *srw_req = sr->u.request;
*http_code = 200;
yaz_log(log_requestdetail, "Got SRW SearchRetrieveRequest");
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (srw_res->num_diagnostics == 0 && assoc->init)
{
bend_search_rr rr;
if (srw_req->query_type == Z_SRW_query_type_cql)
{
- if (assoc->cql_transform)
+ if (assoc->server && assoc->server->cql_transform)
{
int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql,
- assoc->cql_transform, rr.query);
+ assoc->server->cql_transform,
+ rr.query);
if (srw_errcode)
{
yaz_add_srw_diagnostic(assoc->encode,
const char *pqf_msg;
size_t off;
int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
- yaz_log(log_requestdetail, "Parse error %d %s near offset %d",
- code, pqf_msg, off);
+ yaz_log(log_requestdetail, "Parse error %d %s near offset %ld",
+ code, pqf_msg, (long) off);
srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR;
}
}
else
{
- int j = 0;
- int packing = Z_SRW_recordPacking_string;
+ int ok = 1;
if (start + number > rr.hits)
number = rr.hits - start + 1;
- if (srw_req->recordPacking){
- if (!strcmp(srw_req->recordPacking, "xml"))
- packing = Z_SRW_recordPacking_XML;
- if (!strcmp(srw_req->recordPacking, "url"))
- packing = Z_SRW_recordPacking_URL;
- }
- srw_res->records = (Z_SRW_record *)
- odr_malloc(assoc->encode,
- number * sizeof(*srw_res->records));
-
- srw_res->extra_records = (Z_SRW_extra_record **)
- odr_malloc(assoc->encode,
- number*sizeof(*srw_res->extra_records));
-
- for (i = 0; i<number; i++)
+
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
{
- int errcode;
+ bend_present_rr *bprr = (bend_present_rr*)
+ odr_malloc (assoc->decode, sizeof(*bprr));
+ bprr->setname = "default";
+ bprr->start = start;
+ bprr->number = number;
+ bprr->format = VAL_TEXT_XML;
+ if (srw_req->recordSchema)
+ {
+ bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode,
+ sizeof(*bprr->comp));
+ bprr->comp->which = Z_RecordComp_simple;
+ bprr->comp->u.simple = (Z_ElementSetNames *)
+ odr_malloc(assoc->decode, sizeof(Z_ElementSetNames));
+ bprr->comp->u.simple->which = Z_ElementSetNames_generic;
+ bprr->comp->u.simple->u.generic = srw_req->recordSchema;
+ }
+ else
+ {
+ bprr->comp = 0;
+ }
+ bprr->stream = assoc->encode;
+ bprr->referenceId = 0;
+ bprr->print = assoc->print;
+ bprr->request = req;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ (*assoc->init->bend_present)(assoc->backend, bprr);
- srw_res->records[j].recordPacking = packing;
- srw_res->records[j].recordData_buf = 0;
- srw_res->extra_records[j] = 0;
- yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
- errcode = srw_bend_fetch(assoc, i+start, srw_req,
- srw_res->records + j);
- if (errcode)
+ if (!bprr->request)
+ return;
+ if (bprr->errcode)
{
+ srw_error = yaz_diag_bib1_to_srw (bprr->errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
- yaz_diag_bib1_to_srw (errcode),
- rr.errstring);
+ srw_error, bprr->errstring);
+ ok = 0;
+ }
+ }
+
+ if (ok)
+ {
+ int j = 0;
+ int packing = Z_SRW_recordPacking_string;
+ if (srw_req->recordPacking){
+ if (!strcmp(srw_req->recordPacking, "xml"))
+ packing = Z_SRW_recordPacking_XML;
+ if (!strcmp(srw_req->recordPacking, "url"))
+ packing = Z_SRW_recordPacking_URL;
+ }
+ srw_res->records = (Z_SRW_record *)
+ odr_malloc(assoc->encode,
+ number * sizeof(*srw_res->records));
+
+ srw_res->extra_records = (Z_SRW_extra_record **)
+ odr_malloc(assoc->encode,
+ number*sizeof(*srw_res->extra_records));
+
+ for (i = 0; i<number; i++)
+ {
+ int errcode;
+ const char *addinfo = 0;
- break;
+ srw_res->records[j].recordPacking = packing;
+ srw_res->records[j].recordData_buf = 0;
+ srw_res->extra_records[j] = 0;
+ yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
+ errcode = srw_bend_fetch(assoc, i+start, srw_req,
+ srw_res->records + j,
+ &addinfo);
+ if (errcode)
+ {
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ yaz_diag_bib1_to_srw (errcode),
+ addinfo);
+
+ break;
+ }
+ if (srw_res->records[j].recordData_buf)
+ j++;
}
- if (srw_res->records[j].recordData_buf)
- j++;
+ srw_res->num_records = j;
+ if (!j)
+ srw_res->records = 0;
}
- srw_res->num_records = j;
- if (!j)
- srw_res->records = 0;
}
}
}
break;
}
wrbuf_printf(wr, "SRWSearch ");
+ wrbuf_printf(wr, srw_req->database);
+ wrbuf_printf(wr, " ");
if (srw_res->num_diagnostics)
wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri);
else if (*http_code != 200)
static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
xmlNodePtr ptr = rr->server_node_ptr;
if (!ptr)
return 0;
}
static void srw_bend_explain(association *assoc, request *req,
- Z_SRW_explainRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_explainResponse *srw_res,
int *http_code)
{
+ Z_SRW_explainRequest *srw_req = sr->u.explain_request;
yaz_log(log_requestdetail, "Got SRW ExplainRequest");
*http_code = 404;
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (assoc->init)
{
bend_explain_rr rr;
rr.print = assoc->print;
rr.explain_buf = 0;
rr.database = srw_req->database;
- rr.server_node_ptr = assoc->server_node_ptr;
+ if (assoc->server)
+ rr.server_node_ptr = assoc->server->server_node_ptr;
+ else
+ rr.server_node_ptr = 0;
rr.schema = "http://explain.z3950.org/dtd/2.0/";
if (assoc->init->bend_explain)
(*assoc->init->bend_explain)(assoc->backend, &rr);
}
static void srw_bend_scan(association *assoc, request *req,
- Z_SRW_scanRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_scanResponse *srw_res,
int *http_code)
{
+ Z_SRW_scanRequest *srw_req = sr->u.scan_request;
yaz_log(log_requestdetail, "Got SRW ScanRequest");
*http_code = 200;
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (srw_res->num_diagnostics == 0 && assoc->init)
{
struct scan_entry *save_entries;
(*assoc->init->bend_scan))(assoc->backend, bsrr);
}
else if (srw_req->query_type == Z_SRW_query_type_cql
- && assoc->init->bend_scan && assoc->cql_transform)
+ && assoc->init->bend_scan && assoc->server
+ && assoc->server->cql_transform)
{
int srw_error;
bsrr->scanClause = 0;
bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
srw_error = cql2pqf_scan(assoc->encode,
srw_req->scanClause.cql,
- assoc->cql_transform,
+ assoc->server->cql_transform,
bsrr->term);
if (srw_error)
yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
querystr = srw_req->scanClause.cql;
break;
default:
- querytype = "Unknown";
+ querytype = "UNKNOWN";
querystr = "";
}
- wrbuf_printf(wr, "SRWScan %d+%d",
+
+ wrbuf_printf(wr, "SRWScan ");
+ wrbuf_printf(wr, srw_req->database);
+ wrbuf_printf(wr, " ");
+
+ if (srw_res->num_diagnostics)
+ wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri);
+ else if (srw_res->num_terms)
+ wrbuf_printf(wr, "OK %d - ", srw_res->num_terms);
+ else
+ wrbuf_printf(wr, "OK - - ");
+
+ wrbuf_printf(wr, "%d+%d+0 ",
(srw_req->responsePosition ?
*srw_req->responsePosition : 1),
(srw_req->maximumTerms ?
*srw_req->maximumTerms : 1));
- if (srw_res->num_diagnostics)
- wrbuf_printf(wr, " ERROR %s", srw_res->diagnostics[0].uri);
- else
- wrbuf_printf(wr, " OK -");
- wrbuf_printf(wr, " %s: %s", querytype, querystr);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
+ /* there is no step size in SRU/W ??? */
+ wrbuf_printf(wr, "%s: %s ", querytype, querystr);
+ yaz_log(log_request, "%s ", wrbuf_buf(wr) );
wrbuf_free(wr, 1);
}
}
static void srw_bend_update(association *assoc, request *req,
- Z_SRW_updateRequest *srw_req,
+ Z_SRW_PDU *sr,
Z_SRW_updateResponse *srw_res,
int *http_code)
{
+ Z_SRW_updateRequest *srw_req = sr->u.update_request;
yaz_log(YLOG_DEBUG, "Got SRW UpdateRequest");
yaz_log(YLOG_DEBUG, "num_diag = %d", srw_res->num_diagnostics );
*http_code = 404;
- srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics);
+ srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
if (assoc->init)
{
bend_update_rr rr;
rr.response_extra_record = 0;
rr.extra_request_data = 0;
rr.extra_response_data = 0;
- rr.errcode = 0;
- rr.errstring = 0;
+ rr.uri = 0;
+ rr.message = 0;
+ rr.details = 0;
yaz_log(YLOG_DEBUG, "basename = %s", rr.basenames[0] );
yaz_log(YLOG_DEBUG, "Operation = %s", rr.operation );
}
else if ( !strcmp( rr.operation, "insert" ) )
{
+ rr.record_id = srw_req->recordId;
if ( srw_req->record.recordSchema == 0 ){
yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
&srw_res->num_diagnostics,
return;
}
}
- if (rr.errcode)
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- rr.errcode, rr.errstring);
+
+ if (rr.uri)
+ yaz_add_srw_diagnostic_uri(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ rr.uri,
+ rr.message,
+ rr.details);
srw_res->recordId = rr.record_id;
srw_res->operationStatus = rr.operation_status;
srw_res->recordVersion = rr.record_version;
}
}
+/* check if path is OK (1); BAD (0) */
+static int check_path(const char *path)
+{
+ if (*path != '/')
+ return 0;
+ if (strstr(path, ".."))
+ return 0;
+ return 1;
+}
+
+static char *read_file(const char *fname, ODR o, int *sz)
+{
+ char *buf;
+ FILE *inf = fopen(fname, "rb");
+ if (!inf)
+ return 0;
+
+ fseek(inf, 0L, SEEK_END);
+ *sz = ftell(inf);
+ rewind(inf);
+ buf = odr_malloc(o, *sz);
+ fread(buf, 1, *sz, inf);
+ fclose(inf);
+ return buf;
+}
+
static void process_http_request(association *assoc, request *req)
{
Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request;
char *charset = 0;
Z_HTTP_Response *hres = 0;
int keepalive = 1;
- char *stylesheet = 0;
+ const char *stylesheet = 0; /* for now .. set later */
Z_SRW_diagnostic *diagnostic = 0;
int num_diagnostic = 0;
const char *host = z_HTTP_header_lookup(hreq->headers, "Host");
p = z_get_HTTP_Response(o, 404);
r = 1;
}
- if (r == 2 && !strcmp(hreq->path, "/test"))
+ if (r == 2 && assoc->server && assoc->server->docpath
+ && hreq->path[0] == '/'
+ &&
+ /* check if path is a proper prefix of documentroot */
+ strncmp(hreq->path+1, assoc->server->docpath,
+ strlen(assoc->server->docpath))
+ == 0)
{
- p = z_get_HTTP_Response(o, 200);
- hres = p->u.HTTP_Response;
- hres->content_buf = "1234567890\n";
- hres->content_len = strlen(hres->content_buf);
+ if (!check_path(hreq->path))
+ {
+ yaz_log(YLOG_LOG, "File %s access forbidden", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ int content_size = 0;
+ char *content_buf = read_file(hreq->path+1, o, &content_size);
+ if (!content_buf)
+ {
+ yaz_log(YLOG_LOG, "File %s not found", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ const char *ctype = 0;
+ yaz_mime_types types = yaz_mime_types_create();
+
+ yaz_mime_types_add(types, "xsl", "application/xml");
+ yaz_mime_types_add(types, "xml", "application/xml");
+ yaz_mime_types_add(types, "css", "text/css");
+ yaz_mime_types_add(types, "html", "text/html");
+ yaz_mime_types_add(types, "htm", "text/html");
+ yaz_mime_types_add(types, "txt", "text/plain");
+ yaz_mime_types_add(types, "js", "application/x-javascript");
+
+ yaz_mime_types_add(types, "gif", "image/gif");
+ yaz_mime_types_add(types, "png", "image/png");
+ yaz_mime_types_add(types, "jpg", "image/jpeg");
+ yaz_mime_types_add(types, "jpeg", "image/jpeg");
+
+ ctype = yaz_mime_lookup_fname(types, hreq->path);
+ if (!ctype)
+ {
+ yaz_log(YLOG_LOG, "No mime type for %s", hreq->path+1);
+ p = z_get_HTTP_Response(o, 404);
+ }
+ else
+ {
+ p = z_get_HTTP_Response(o, 200);
+ hres = p->u.HTTP_Response;
+ hres->content_buf = content_buf;
+ hres->content_len = content_size;
+ z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
+ }
+ yaz_mime_types_destroy(types);
+ }
+ }
r = 1;
}
+
if (r == 2)
{
r = yaz_srw_decode(hreq, &sr, &soap_package, assoc->decode, &charset);
}
else
{
- srw_bend_search(assoc, req, sr->u.request, res->u.response,
+ srw_bend_search(assoc, req, sr, res->u.response,
&http_code);
}
if (http_code == 200)
res->u.explain_response->diagnostics = diagnostic;
res->u.explain_response->num_diagnostics = num_diagnostic;
}
- srw_bend_explain(assoc, req, sr->u.explain_request,
+ srw_bend_explain(assoc, req, sr,
res->u.explain_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
res->u.scan_response->diagnostics = diagnostic;
res->u.scan_response->num_diagnostics = num_diagnostic;
}
- srw_bend_scan(assoc, req, sr->u.scan_request,
+ srw_bend_scan(assoc, req, sr,
res->u.scan_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
res->u.update_response->num_diagnostics = num_diagnostic;
}
yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics );
- srw_bend_update(assoc, req, sr->u.update_request,
+ srw_bend_update(assoc, req, sr,
res->u.update_response, &http_code);
if (http_code == 200)
soap_package->u.generic->p = res;
if (http_code == 200 || http_code == 500)
{
static Z_SOAP_Handler soap_handlers[4] = {
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
{"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
{"http://www.loc.gov/zing/srw/v1.0/", 0,
int ret;
p = z_get_HTTP_Response(o, 200);
hres = p->u.HTTP_Response;
+
+ if (!stylesheet && assoc->server)
+ stylesheet = assoc->server->stylesheet;
+
+ /* empty stylesheet means NO stylesheet */
+ if (stylesheet && *stylesheet == '\0')
+ stylesheet = 0;
+
ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package,
&hres->content_buf, &hres->content_len,
soap_handlers, charset, stylesheet);
strcat(options, " negotiation");
}
- ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
+ if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
+ ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
{
}
yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options);
- assoc->maximumRecordSize = *req->maximumRecordSize;
- if (cb && assoc->maximumRecordSize > cb->maxrecordsize)
- assoc->maximumRecordSize = cb->maxrecordsize;
- assoc->preferredMessageSize = *req->preferredMessageSize;
- if (assoc->preferredMessageSize > assoc->maximumRecordSize)
- assoc->preferredMessageSize = assoc->maximumRecordSize;
+ if (*req->maximumRecordSize < assoc->maximumRecordSize)
+ assoc->maximumRecordSize = *req->maximumRecordSize;
+
+ if (*req->preferredMessageSize < assoc->preferredMessageSize)
+ assoc->preferredMessageSize = *req->preferredMessageSize;
resp->preferredMessageSize = &assoc->preferredMessageSize;
resp->maximumRecordSize = &assoc->maximumRecordSize;
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.67 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.98 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
freq.print = a->print;
freq.referenceId = referenceId;
freq.schema = 0;
- (*a->init->bend_fetch)(a->backend, &freq);
+
+ retrieve_fetch(a, &freq);
*next = freq.last_in_set ? 0 : recno + 1;
bsrr->errstring = NULL;
bsrr->search_info = NULL;
- if (assoc->cql_transform &&
- req->query->which == Z_Query_type_104 &&
- req->query->u.type_104->which == Z_External_CQL)
+ if (assoc->server && assoc->server->cql_transform
+ && req->query->which == Z_Query_type_104
+ && req->query->u.type_104->which == Z_External_CQL)
{
/* have a CQL query and a CQL to PQF transform .. */
int srw_errcode =
cql2pqf(bsrr->stream, req->query->u.type_104->u.cql,
- assoc->cql_transform, bsrr->query);
+ assoc->server->cql_transform, bsrr->query);
if (srw_errcode)
bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode);
}
form = VAL_NONE;
else
form = prefformat->value;
- resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form, req->referenceId,
- req->preferredRecordSyntax, NULL);
+
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
+ {
+ bend_present_rr *bprr = (bend_present_rr *)
+ nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ bprr->setname = req->resultSetName;
+ bprr->start = 1;
+ bprr->number = *toget;
+ bprr->format = form;
+ bprr->comp = compp;
+ bprr->referenceId = req->referenceId;
+ bprr->stream = assoc->encode;
+ bprr->print = assoc->print;
+ bprr->request = reqb;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ (*assoc->init->bend_present)(assoc->backend, bprr);
+
+ if (!bprr->request)
+ return 0;
+ if (bprr->errcode)
+ {
+ resp->records = diagrec(assoc, bprr->errcode, bprr->errstring);
+ *resp->presentStatus = Z_PresentStatus_failure;
+ }
+ }
+
+ if (!resp->records)
+ resp->records = pack_records(assoc, req->resultSetName, 1,
+ toget, compp, next, presst, form, req->referenceId,
+ req->preferredRecordSyntax, NULL);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
if (log_request)
{
+ int i;
WRBUF wr = wrbuf_alloc();
+
+ for (i = 0 ; i < req->num_databaseNames; i++){
+ if (i)
+ wrbuf_printf(wr, "+");
+ wrbuf_printf(wr, req->databaseNames[i]);
+ }
+ wrbuf_printf(wr, " ");
+
if (bsrt->errcode)
wrbuf_printf(wr, "ERROR %d", bsrt->errcode);
else
wrbuf_printf(wr, "Present ");
if (*resp->presentStatus == Z_PresentStatus_failure)
- wrbuf_printf(wr, "ERROR %d", errcode);
+ wrbuf_printf(wr, "ERROR %d ", errcode);
else if (*resp->presentStatus == Z_PresentStatus_success)
- wrbuf_printf(wr, "OK -");
+ wrbuf_printf(wr, "OK - ");
else
- wrbuf_printf(wr, "Partial %d", *resp->presentStatus);
+ wrbuf_printf(wr, "Partial %d - ", *resp->presentStatus);
wrbuf_printf(wr, " %s %d+%d ",
req->resultSetId, *req->resultSetStartPoint,
}
if (log_request)
{
+ int i;
WRBUF wr = wrbuf_alloc();
- if (bsrr->errcode)
+ wrbuf_printf(wr, "Scan ");
+ for (i = 0 ; i < req->num_databaseNames; i++){
+ if (i)
+ wrbuf_printf(wr, "+");
+ wrbuf_printf(wr, req->databaseNames[i]);
+ }
+ wrbuf_printf(wr, " ");
+
+ if (bsrr->errcode){
wr_diag(wr, bsrr->errcode, bsrr->errstring);
- else if (*res->scanStatus == Z_Scan_success)
- wrbuf_printf(wr, "OK");
+ wrbuf_printf(wr, " ");
+ }
else
- wrbuf_printf(wr, "Partial");
+ wrbuf_printf(wr, "OK ");
+ /* else if (*res->scanStatus == Z_Scan_success) */
+ /* wrbuf_printf(wr, "OK "); */
+ /* else */
+ /* wrbuf_printf(wr, "Partial "); */
+
+ if (*res->numberOfEntriesReturned)
+ wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned);
+ else
+ wrbuf_printf(wr, "0 - ");
- wrbuf_printf(wr, " %d+%d %d ",
+ wrbuf_printf(wr, "%d+%d+%d ",
(req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1),
*req->numberOfTermsRequested,
- (res->stepSize ? *res->stepSize : 0));
+ (res->stepSize ? *res->stepSize : 1));
+
yaz_scan_to_wrbuf(wr, req->termListAndStartPoint,
bsrr->attributeset);
- yaz_log(log_request, "Scan %s", wrbuf_buf(wr) );
+ yaz_log(log_request, "%s", wrbuf_buf(wr) );
wrbuf_free(wr, 1);
}
return apdu;
for (i = 0; i<req->num_inputResultSetNames; i++)
{
if (i)
- wrbuf_printf(wr, ",");
+ wrbuf_printf(wr, "+");
wrbuf_printf(wr, req->inputResultSetNames[i]);
}
wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
{
bend_esrequest_rr esrequest;
+ const char *ext_name = "unknown";
Z_ExtendedServicesRequest *req =
reqb->apdu_request->u.extendedServicesRequest;
Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse;
- yaz_log(log_requestdetail,"Got EsRequest");
-
esrequest.esr = reqb->apdu_request->u.extendedServicesRequest;
esrequest.stream = assoc->encode;
esrequest.decode = assoc->decode;
esrequest.association = assoc;
esrequest.taskPackage = 0;
esrequest.referenceId = req->referenceId;
+
+ if (esrequest.esr && esrequest.esr->taskSpecificParameters)
+ {
+ switch(esrequest.esr->taskSpecificParameters->which)
+ {
+ case Z_External_itemOrder:
+ ext_name = "ItemOrder"; break;
+ case Z_External_update:
+ ext_name = "Update"; break;
+ case Z_External_update0:
+ ext_name = "Update0"; break;
+ case Z_External_ESAdmin:
+ ext_name = "Admin"; break;
+
+ }
+ }
+
(*assoc->init->bend_esrequest)(assoc->backend, &esrequest);
/* If the response is being delayed, return NULL */
if (esrequest.errcode == -1)
{
/* Backend service indicates request will be processed */
- yaz_log(log_request,"EsRequest OK: Accepted !");
+ yaz_log(log_request, "Extended Service: %s (accepted)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_accepted;
}
else if (esrequest.errcode == 0)
{
/* Backend service indicates request will be processed */
- yaz_log(log_request,"EsRequest OK: Done !");
+ yaz_log(log_request, "Extended Service: %s (done)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_done;
}
else
zget_DiagRecs(assoc->encode, esrequest.errcode,
esrequest.errstring);
/* Backend indicates error, request will not be processed */
- yaz_log(YLOG_DEBUG,"Request could not be processed...failure !");
+ yaz_log(log_request, "Extended Service: %s (failed)", ext_name);
*resp->operationStatus = Z_ExtendedServicesResponse_failure;
resp->num_diagnostics = diagRecs->num_diagRecs;
resp->diagnostics = diagRecs->diagRecs;
projects / yaz-moved-to-github.git / blobdiff