* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.111 2007-03-13 09:12:09 adam Exp $
+ * $Id: seshigh.c,v 1.115 2007-04-16 21:53:09 adam Exp $
*/
/**
* \file seshigh.c
#include "session.h"
#include "mime.h"
#include <yaz/proto.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <yaz/log.h>
#include <yaz/logrpn.h>
#include <yaz/querytowrbuf.h>
#include <yaz/otherinfo.h>
#include <yaz/yaz-util.h>
#include <yaz/pquery.h>
+#include <yaz/oid_db.h>
#include <yaz/srw.h>
#include <yaz/backend.h>
{
int r;
const char *input_schema = yaz_get_esn(rr->comp);
- Odr_oid *input_syntax_raw = rr->request_format_raw;
+ Odr_oid *input_syntax_raw = rr->request_format;
const char *backend_schema = 0;
Odr_oid *backend_syntax = 0;
if (input_syntax_raw)
{
char oidbuf[OID_STR_MAX];
- oid_to_dotstring(input_syntax_raw, oidbuf);
+ oid_oid_to_dotstring(input_syntax_raw, oidbuf);
rr->errstring = odr_strdup(rr->stream, oidbuf);
}
return -1;
}
if (backend_schema)
{
- yaz_set_esn(&rr->comp, backend_schema, rr->stream->mem);
+ yaz_set_esn(&rr->comp, backend_schema, odr_getmem(rr->stream));
}
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;
- }
+ rr->request_format = backend_syntax;
}
(*assoc->init->bend_fetch)(assoc->backend, rr);
if (rc && rr->record && rr->errcode == 0 && rr->len > 0)
rr->record = odr_malloc(rr->stream, rr->len);
memcpy(rr->record, wrbuf_buf(output_record), rr->len);
}
- wrbuf_free(output_record, 1);
+ wrbuf_destroy(output_record);
}
if (match_syntax)
- {
- struct oident *oi = oid_getentbyoid(match_syntax);
- rr->output_format = oi ? oi->value : VAL_NONE;
- rr->output_format_raw = match_syntax;
- }
+ rr->output_format = match_syntax;
if (match_schema)
rr->schema = odr_strdup(rr->stream, match_schema);
return 0;
rr.setname = "default";
rr.number = pos;
rr.referenceId = 0;
- rr.request_format = VAL_TEXT_XML;
- rr.request_format_raw = yaz_oidval_to_z3950oid(assoc->decode,
- CLASS_RECSYN,
- VAL_TEXT_XML);
+ rr.request_format = odr_oiddup(assoc->decode, yaz_oid_recsyn_xml);
+
rr.comp = (Z_RecordComposition *)
odr_malloc(assoc->decode, sizeof(*rr.comp));
rr.comp->which = Z_RecordComp_complex;
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,
srw_res->resultSetId : "-"),
(srw_req->startRecord ? *srw_req->startRecord : 1),
srw_res->num_records);
- yaz_log(log_request, "%s %s: %s", wrbuf_buf(wr), querytype, querystr);
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s %s: %s", wrbuf_cstr(wr), querytype, querystr);
+ wrbuf_destroy(wr);
}
}
if (srw_req->query_type == Z_SRW_query_type_pqf &&
assoc->init->bend_scan)
{
- Odr_oid *scan_attributeSet = 0;
- oident *attset;
YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
bsrr->term = yaz_pqf_scan(pqf_parser, assoc->decode,
- &scan_attributeSet,
+ &bsrr->attributeset,
srw_req->scanClause.pqf);
- if (scan_attributeSet &&
- (attset = oid_getentbyoid(scan_attributeSet)) &&
- (attset->oclass == CLASS_ATTSET ||
- attset->oclass == CLASS_GENERAL))
- bsrr->attributeset = attset->value;
- else
- bsrr->attributeset = VAL_NONE;
yaz_pqf_destroy(pqf_parser);
bsrr->scanClause = 0;
((int (*)(void *, bend_scan_rr *))
{
int srw_error;
bsrr->scanClause = 0;
- bsrr->attributeset = VAL_NONE;
+ bsrr->attributeset = 0;
bsrr->term = odr_malloc(assoc->decode, sizeof(*bsrr->term));
srw_error = cql2pqf_scan(assoc->encode,
srw_req->scanClause.cql,
&& assoc->init->bend_srw_scan)
{
bsrr->term = 0;
- bsrr->attributeset = VAL_NONE;
+ bsrr->attributeset = 0;
bsrr->scanClause = srw_req->scanClause.cql;
((int (*)(void *, bend_scan_rr *))
(*assoc->init->bend_srw_scan))(assoc->backend, bsrr);
*srw_req->maximumTerms : 1));
/* 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);
+ yaz_log(log_request, "%s ", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
}
static char *get_vhost(Z_OtherInformation *otherInfo)
{
- return yaz_oi_get_string_oidval(&otherInfo, VAL_PROXY, 1, 0);
+ return yaz_oi_get_string_oid(&otherInfo, yaz_oid_userinfo_proxy, 1, 0);
}
/*
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.111 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.115 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
(req->implementationVersion ?
req->implementationVersion : "-")
);
- yaz_log(log_request, "%s", wrbuf_buf(wr));
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr));
+ wrbuf_destroy(wr);
}
return apdu;
}
static Z_Records *pack_records(association *a, char *setname, int start,
int *num, Z_RecordComposition *comp,
- int *next, int *pres, oid_value format,
+ int *next, int *pres,
Z_ReferenceId *referenceId,
int *oid, int *errcode)
{
freq.surrogate_flag = 0;
freq.number = recno;
freq.comp = comp;
- freq.request_format = format;
- freq.request_format_raw = oid;
- freq.output_format = format;
- freq.output_format_raw = 0;
+ freq.request_format = oid;
+ freq.output_format = 0;
freq.stream = a->encode;
freq.print = a->print;
freq.referenceId = referenceId;
thisrec->databaseName = 0;
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (freq.output_format_raw)
- {
- struct oident *ident = oid_getentbyoid(freq.output_format_raw);
- freq.output_format = ident->value;
- }
- thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format,
- freq.record, freq.len);
+ if (!freq.output_format)
+ freq.output_format = freq.request_format;
+ thisrec->u.databaseRecord = z_ext_record_oid(
+ a->encode, freq.output_format, freq.record, freq.len);
if (!thisrec->u.databaseRecord)
return 0;
reclist->records[reclist->num_records] = thisrec;
bsrr->basenames = req->databaseNames;
bsrr->query = req->query;
bsrr->stream = assoc->encode;
- nmem_transfer(bsrr->stream->mem, reqb->request_mem);
+ nmem_transfer(odr_getmem(bsrr->stream), reqb->request_mem);
bsrr->decode = assoc->decode;
bsrr->print = assoc->print;
bsrr->hits = 0;
if (*toget && !resp->records)
{
- oident *prefformat;
- oid_value form;
int *presst = odr_intdup(assoc->encode, 0);
-
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
- form = VAL_NONE;
- else
- form = prefformat->value;
-
/* Call bend_present if defined */
if (assoc->init->bend_present)
{
bprr->setname = req->resultSetName;
bprr->start = 1;
bprr->number = *toget;
- bprr->format = form;
+ bprr->format = req->preferredRecordSyntax;
bprr->comp = compp;
bprr->referenceId = req->referenceId;
bprr->stream = assoc->encode;
}
if (!resp->records)
- resp->records = pack_records(assoc, req->resultSetName, 1,
- toget, compp, next, presst, form, req->referenceId,
- req->preferredRecordSyntax, NULL);
+ resp->records = pack_records(
+ assoc, req->resultSetName, 1,
+ toget, compp, next, presst, req->referenceId,
+ req->preferredRecordSyntax, NULL);
if (!resp->records)
return 0;
resp->numberOfRecordsReturned = toget;
req->resultSetName, returnedrecs);
yaz_query_to_wrbuf(wr, req->query);
- yaz_log(log_request, "Search %s", wrbuf_buf(wr));
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "Search %s", wrbuf_cstr(wr));
+ wrbuf_destroy(wr);
}
return apdu;
}
int *fd)
{
Z_PresentRequest *req = reqb->apdu_request->u.presentRequest;
- oident *prefformat;
- oid_value form;
Z_APDU *apdu;
Z_PresentResponse *resp;
int *next;
yaz_log(log_requestdetail, "Got PresentRequest.");
- if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)))
- form = VAL_NONE;
- else
- form = prefformat->value;
resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
resp->records = 0;
resp->presentStatus = odr_intdup(assoc->encode, 0);
bprr->setname = req->resultSetId;
bprr->start = *req->resultSetStartPoint;
bprr->number = *req->numberOfRecordsRequested;
- bprr->format = form;
+ bprr->format = req->preferredRecordSyntax;
bprr->comp = req->recordComposition;
bprr->referenceId = req->referenceId;
bprr->stream = assoc->encode;
pack_records(assoc, req->resultSetId, *req->resultSetStartPoint,
num, req->recordComposition, next,
resp->presentStatus,
- form, req->referenceId, req->preferredRecordSyntax,
+ req->referenceId, req->preferredRecordSyntax,
&errcode);
}
if (log_request)
wrbuf_printf(wr, " %s %d+%d ",
req->resultSetId, *req->resultSetStartPoint,
*req->numberOfRecordsRequested);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
if (!resp->records)
return 0;
Z_ListEntries *ents = (Z_ListEntries *)
odr_malloc (assoc->encode, sizeof(*ents));
Z_DiagRecs *diagrecs_p = NULL;
- oident *attset;
bend_scan_rr *bsrr = (bend_scan_rr *)
odr_malloc (assoc->encode, sizeof(*bsrr));
struct scan_entry *save_entries;
}
save_entries = bsrr->entries; /* save it so we can compare later */
- if (req->attributeSet &&
- (attset = oid_getentbyoid(req->attributeSet)) &&
- (attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL))
- bsrr->attributeset = attset->value;
- else
- bsrr->attributeset = VAL_NONE;
+ bsrr->attributeset = req->attributeSet;
log_scan_term_level (log_requestdetail, req->termListAndStartPoint,
bsrr->attributeset);
bsrr->term_position = req->preferredPositionInResponse ?
yaz_scan_to_wrbuf(wr, req->termListAndStartPoint,
bsrr->attributeset);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
}
wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
wrbuf_printf(wr, "OK -");
for (i = 0; i<req->num_resultSetList; i++)
wrbuf_printf(wr, " %s ", req->resultSetList[i]);
- yaz_log(log_request, "%s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "%s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
return apdu;
}
{
WRBUF wr = wrbuf_alloc();
wrbuf_diags(wr, resp->num_diagnostics, resp->diagnostics);
- yaz_log(log_request, "EsRequest %s", wrbuf_buf(wr) );
- wrbuf_free(wr, 1);
+ yaz_log(log_request, "EsRequest %s", wrbuf_cstr(wr) );
+ wrbuf_destroy(wr);
}
}
/* Do something with the members of bend_extendedservice */
if (esrequest.taskPackage)
- resp->taskPackage = z_ext_record (assoc->encode, VAL_EXTENDED,
- (const char *) esrequest.taskPackage,
- -1);
+ {
+ resp->taskPackage = z_ext_record_oid(
+ assoc->encode, yaz_oid_recsyn_extended,
+ (const char *) esrequest.taskPackage, -1
+ );
+ }
yaz_log(YLOG_DEBUG,"Send the result apdu");
return apdu;
}
projects / yaz-moved-to-github.git / blobdiff