-/*
- * Copyright (c) 2000-2001, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
* See the file LICENSE for details.
- *
- * $Log: yaz-z-server-sr.cpp,v $
- * Revision 1.1 2001-03-27 15:02:14 adam
- * New server facility scheme.
- *
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/log.h>
-#include <yaz++/yaz-z-server.h>
-
-/*
- * database record.
- */
-void Yaz_Facility_Retrieval::create_databaseRecord (
- Z_NamePlusRecord *rec, const char *dbname, int format,
- const void *buf, int len)
-{
- rec->databaseName = dbname ? odr_strdup (m_odr, dbname) : 0;
- rec->which = Z_NamePlusRecord_databaseRecord;
- rec->u.databaseRecord = z_ext_record (m_odr, format,
- (const char *) buf, len);
-}
+#include <yazpp/z-server.h>
-/*
- * surrogate diagnostic.
- */
-void Yaz_Facility_Retrieval::create_surrogateDiagnostics(
- Z_NamePlusRecord *rec, const char *dbname, int error, char *const addinfo)
-{
- int oid[OID_SIZE];
- int *err = (int *)odr_malloc (m_odr, sizeof(*err));
- oident bib1;
- Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (m_odr, sizeof(*drec));
- Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
- odr_malloc (m_odr, sizeof(*dr));
-
- bib1.proto = PROTO_Z3950;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
- *err = error;
- rec->databaseName = dbname ? odr_strdup (m_odr, dbname) : 0;
- rec->which = Z_NamePlusRecord_surrogateDiagnostic;
- rec->u.surrogateDiagnostic = drec;
- drec->which = Z_DiagRec_defaultFormat;
- drec->u.defaultFormat = dr;
- dr->diagnosticSetId = odr_oiddup (m_odr,
- oid_ent_to_oid(&bib1, oid));
- dr->condition = err;
- dr->which = Z_DefaultDiagFormat_v2Addinfo;
- dr->u.v2Addinfo = odr_strdup (m_odr, addinfo ? addinfo : "");
-}
+using namespace yazpp_1;
-Z_Records *Yaz_Facility_Retrieval::create_nonSurrogateDiagnostics (
- int error, const char *addinfo)
-{
- int oid[OID_SIZE];
- Z_Records *rec = (Z_Records *)
- odr_malloc (m_odr, sizeof(*rec));
- oident bib1;
- int *err = (int *)
- odr_malloc (m_odr, sizeof(*err));
- Z_DiagRec *drec = (Z_DiagRec *)
- odr_malloc (m_odr, sizeof(*drec));
- Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
- odr_malloc (m_odr, sizeof(*dr));
-
- bib1.proto = PROTO_Z3950;
- bib1.oclass = CLASS_DIAGSET;
- bib1.value = VAL_BIB1;
-
- *err = error;
- rec->which = Z_Records_NSD;
- rec->u.nonSurrogateDiagnostic = dr;
- dr->diagnosticSetId =
- odr_oiddup (m_odr, oid_ent_to_oid(&bib1, oid));
- dr->condition = err;
- dr->which = Z_DefaultDiagFormat_v2Addinfo;
- dr->u.v2Addinfo = odr_strdup (m_odr, addinfo ? addinfo : "");
- return rec;
-}
-
-Z_Records *Yaz_Facility_Retrieval::pack_records (const char *resultSetName,
- int start, int xnum,
- Z_RecordComposition *comp,
- int *next, int *pres,
- int *format)
+Z_Records *Yaz_Facility_Retrieval::pack_records (Z_Server *s,
+ const char *resultSetName,
+ int start, int xnum,
+ Z_RecordComposition *comp,
+ Odr_int *next, Odr_int *pres,
+ Odr_oid *format)
{
int recno, total_length = 0, toget = xnum, dumped_records = 0;
Z_Records *records =
- (Z_Records *) odr_malloc (m_odr, sizeof(*records));
+ (Z_Records *) odr_malloc (odr_encode(), sizeof(*records));
Z_NamePlusRecordList *reclist =
- (Z_NamePlusRecordList *) odr_malloc (m_odr, sizeof(*reclist));
+ (Z_NamePlusRecordList *) odr_malloc (odr_encode(), sizeof(*reclist));
Z_NamePlusRecord **list =
- (Z_NamePlusRecord **) odr_malloc (m_odr, sizeof(*list) * toget);
+ (Z_NamePlusRecord **) odr_malloc (odr_encode(), sizeof(*list) * toget);
records->which = Z_Records_DBOSD;
records->u.databaseOrSurDiagnostics = reclist;
reclist->num_records = 0;
reclist->records = list;
- *pres = Z_PRES_SUCCESS;
+ *pres = Z_PresentStatus_success;
*next = 0;
- yaz_log(LOG_LOG, "Request to pack %d+%d", start, toget);
- yaz_log(LOG_LOG, "pms=%d, mrs=%d", m_preferredMessageSize,
- m_maximumRecordSize);
for (recno = start; reclist->num_records < toget; recno++)
{
- Z_NamePlusRecord *this_rec =
- (Z_NamePlusRecord *) odr_malloc (m_odr, sizeof(*this_rec));
- this_rec->databaseName = 0;
- this_rec->which = Z_NamePlusRecord_databaseRecord;
- this_rec->u.databaseRecord = 0;
-
- int this_length = 0;
-
- sr_record (resultSetName, recno, format, comp, this_rec, records);
-
- if (records->which != Z_Records_DBOSD)
- {
- *pres = Z_PRES_FAILURE;
- return records;
- }
-
- if (this_rec->which == Z_NamePlusRecord_databaseRecord &&
- this_rec->u.databaseRecord == 0)
- { // handler did not return a record..
- create_surrogateDiagnostics(this_rec, 0, 14, 0);
- }
- /*
- * we get the number of bytes allocated on the stream before any
- * allocation done by the backend - this should give us a reasonable
- * idea of the total size of the data so far.
- */
- total_length = odr_total(m_odr) - dumped_records;
- this_length = odr_total(m_odr) - total_length;
- yaz_log(LOG_LOG, " fetched record, len=%d, total=%d",
- this_length, total_length);
- if (this_length + total_length > m_preferredMessageSize)
- {
- /* record is small enough, really */
- if (this_length <= m_preferredMessageSize)
- {
- yaz_log(LOG_LOG, " Dropped last normal-sized record");
- *pres = Z_PRES_PARTIAL_2;
- break;
- }
- if (this_length >= m_maximumRecordSize)
- { /* too big entirely */
- yaz_log(LOG_LOG, "Record > maxrcdsz");
- reclist->records[reclist->num_records] = this_rec;
- create_surrogateDiagnostics(this_rec,
- this_rec->databaseName, 17, 0);
- reclist->num_records++;
- *next = recno + 1;
- dumped_records += this_length;
- continue;
- }
- else /* record can only be fetched by itself */
- {
- yaz_log(LOG_LOG, " Record > prefmsgsz");
- if (toget > 1)
- {
- yaz_log(LOG_DEBUG, " Dropped it");
- reclist->records[reclist->num_records] = this_rec;
- create_surrogateDiagnostics(this_rec,
- this_rec->databaseName,
- 16, 0);
- reclist->num_records++;
- // *next = freq.last_in_set ? 0 : recno + 1;
- *next = recno + 1;
- dumped_records += this_length;
- continue;
- }
- }
- }
- reclist->records[reclist->num_records] = this_rec;
- reclist->num_records++;
- *next = recno + 1;
+ Z_NamePlusRecord *this_rec =
+ (Z_NamePlusRecord *) odr_malloc (odr_encode(), sizeof(*this_rec));
+ this_rec->databaseName = 0;
+ this_rec->which = Z_NamePlusRecord_databaseRecord;
+ this_rec->u.databaseRecord = 0;
+
+ int this_length = 0;
+
+ sr_record (resultSetName, recno, format, comp, this_rec, records);
+
+ if (records->which != Z_Records_DBOSD)
+ {
+ *pres = Z_PresentStatus_failure;
+ return records;
+ }
+
+ if (this_rec->which == Z_NamePlusRecord_databaseRecord &&
+ this_rec->u.databaseRecord == 0)
+ { // handler did not return a record..
+ create_surrogateDiagnostics(odr_encode(), this_rec, 0, 14, 0);
+ }
+ /*
+ * we get the number of bytes allocated on the stream before any
+ * allocation done by the backend - this should give us a reasonable
+ * idea of the total size of the data so far.
+ */
+ total_length = odr_total(odr_encode()) - dumped_records;
+ this_length = odr_total(odr_encode()) - total_length;
+ if (this_length + total_length > m_preferredMessageSize)
+ {
+ /* record is small enough, really */
+ if (this_length <= m_preferredMessageSize)
+ {
+ *pres = Z_PresentStatus_partial_2;
+ break;
+ }
+ if (this_length >= m_maximumRecordSize)
+ { /* too big entirely */
+ reclist->records[reclist->num_records] = this_rec;
+ create_surrogateDiagnostics(odr_encode(), this_rec,
+ this_rec->databaseName, 17, 0);
+ reclist->num_records++;
+ *next = recno + 1;
+ dumped_records += this_length;
+ continue;
+ }
+ else /* record can only be fetched by itself */
+ {
+ if (toget > 1)
+ {
+ yaz_log(YLOG_DEBUG, " Dropped it");
+ reclist->records[reclist->num_records] = this_rec;
+ create_surrogateDiagnostics(odr_encode(), this_rec,
+ this_rec->databaseName,
+ 16, 0);
+ reclist->num_records++;
+ // *next = freq.last_in_set ? 0 : recno + 1;
+ *next = recno + 1;
+ dumped_records += this_length;
+ continue;
+ }
+ }
+ }
+ reclist->records[reclist->num_records] = this_rec;
+ reclist->num_records++;
+ *next = recno + 1;
}
return records;
}
-void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_SearchRequest *req,
- Z_SearchResponse *res)
+void Yaz_Facility_Retrieval::fetch_via_piggyback (Z_Server *s,
+ Z_SearchRequest *req,
+ Z_SearchResponse *res)
{
- bool_t *sr = (bool_t *)odr_malloc (m_odr, sizeof(*sr));
+ bool_t *sr = (bool_t *)odr_malloc (odr_encode(), sizeof(*sr));
*sr = 1;
-
+
int toget = 0;
-
+
Z_RecordComposition comp, *compp = 0;
int hits = *res->resultCount;
-
- int *nulint = (int *)odr_malloc (m_odr, sizeof(*nulint));
+
+ Odr_int *nulint = (Odr_int *)odr_malloc (odr_encode(), sizeof(*nulint));
*nulint = 0;
-
+
comp.which = Z_RecordComp_simple;
/* how many records does the user agent want, then? */
if (hits <= *req->smallSetUpperBound)
{
- toget = hits;
- if ((comp.u.simple = req->smallSetElementSetNames))
- compp = ∁
+ toget = hits;
+ if ((comp.u.simple = req->smallSetElementSetNames))
+ compp = ∁
}
else if (hits < *req->largeSetLowerBound)
{
- toget = *req->mediumSetPresentNumber;
- if (toget > hits)
- toget = hits;
- if ((comp.u.simple = req->mediumSetElementSetNames))
- compp = ∁
+ toget = *req->mediumSetPresentNumber;
+ if (toget > hits)
+ toget = hits;
+ if ((comp.u.simple = req->mediumSetElementSetNames))
+ compp = ∁
}
-
+
if (toget && !res->records)
{
- res->presentStatus = (int *) odr_malloc (m_odr, sizeof(int));
- *res->presentStatus = Z_PRES_SUCCESS;
- res->records =
- pack_records(req->resultSetName, 1, toget, compp,
- res->nextResultSetPosition,
- res->presentStatus,
- req->preferredRecordSyntax);
- if (!res->records)
- return;
- if (res->records->which == Z_Records_DBOSD)
- *res->numberOfRecordsReturned =
- res->records->u.databaseOrSurDiagnostics->num_records;
- res->searchStatus = sr;
- res->resultSetStatus = 0;
+ res->presentStatus = (Odr_int *)
+ odr_malloc (odr_encode(), sizeof(Odr_int));
+ *res->presentStatus = Z_PresentStatus_success;
+ res->records =
+ pack_records(s, req->resultSetName, 1, toget, compp,
+ res->nextResultSetPosition,
+ res->presentStatus,
+ req->preferredRecordSyntax);
+ if (!res->records)
+ return;
+ if (res->records->which == Z_Records_DBOSD)
+ *res->numberOfRecordsReturned =
+ res->records->u.databaseOrSurDiagnostics->num_records;
+ res->searchStatus = sr;
+ res->resultSetStatus = 0;
}
else
{
- if (hits)
- *res->nextResultSetPosition = 1;
- res->numberOfRecordsReturned = nulint;
- res->searchStatus = sr;
- res->resultSetStatus = 0;
- res->presentStatus = 0;
+ if (hits)
+ *res->nextResultSetPosition = 1;
+ res->numberOfRecordsReturned = nulint;
+ res->searchStatus = sr;
+ res->resultSetStatus = 0;
+ res->presentStatus = 0;
}
}
-void Yaz_Facility_Retrieval::fetch_via_present (Z_PresentRequest *req,
- Z_PresentResponse *res)
+void Yaz_Facility_Retrieval::fetch_via_present (Z_Server *s,
+ Z_PresentRequest *req,
+ Z_PresentResponse *res)
{
- res->records = pack_records (req->resultSetId,*req->resultSetStartPoint,
- *req->numberOfRecordsRequested,
- req->recordComposition,
- res->nextResultSetPosition,
- res->presentStatus,
- req->preferredRecordSyntax);
+ res->records =
+ pack_records (s, req->resultSetId,*req->resultSetStartPoint,
+ *req->numberOfRecordsRequested,
+ req->recordComposition,
+ res->nextResultSetPosition,
+ res->presentStatus,
+ req->preferredRecordSyntax);
if (res->records->which == Z_Records_DBOSD)
- *res->numberOfRecordsReturned =
- res->records->u.databaseOrSurDiagnostics->num_records;
-}
-
-ODR Yaz_Facility_Retrieval::odr_encode()
-{
- return m_odr;
+ *res->numberOfRecordsReturned =
+ res->records->u.databaseOrSurDiagnostics->num_records;
}
-int Yaz_Facility_Retrieval::init(Yaz_Z_Server *s, Z_InitRequest *initRequest,
- Z_InitResponse *initResponse)
+int Yaz_Facility_Retrieval::init(Z_Server *s, Z_InitRequest *initRequest,
+ Z_InitResponse *initResponse)
{
Z_Options *req = initRequest->options;
Z_Options *res = initResponse->options;
-
+
if (ODR_MASK_GET(req, Z_Options_search))
- ODR_MASK_SET(res, Z_Options_search);
+ ODR_MASK_SET(res, Z_Options_search);
if (ODR_MASK_GET(req, Z_Options_present))
- ODR_MASK_SET(res, Z_Options_present);
+ ODR_MASK_SET(res, Z_Options_present);
m_preferredMessageSize = *initRequest->preferredMessageSize;
m_maximumRecordSize = *initRequest->maximumRecordSize;
return sr_init (initRequest, initResponse);
}
-int Yaz_Facility_Retrieval::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
-{
+ODR Yaz_Facility_Retrieval::odr_encode()
+{
+ return m_odr_encode;
+}
+
+ODR Yaz_Facility_Retrieval::odr_decode()
+{
+ return m_odr_decode;
+}
+
+int Yaz_Facility_Retrieval::recv(Z_Server *s, Z_APDU *apdu_request)
+{
Z_APDU *apdu_response;
- m_odr = s->odr_encode();
+ m_odr_encode = s->odr_encode();
+ m_odr_decode = s->odr_decode();
switch (apdu_request->which)
{
case Z_APDU_searchRequest:
- yaz_log (LOG_LOG, "got SearchRequest p=%p", this);
- apdu_response = s->create_Z_PDU(Z_APDU_searchResponse);
- sr_search (apdu_request->u.searchRequest,
- apdu_response->u.searchResponse);
- if (!apdu_response->u.searchResponse->records)
- {
- fetch_via_piggyback(apdu_request->u.searchRequest,
- apdu_response->u.searchResponse);
- }
- s->send_Z_PDU(apdu_response);
- return 1;
+ apdu_response = s->create_Z_PDU(Z_APDU_searchResponse);
+ s->transfer_referenceId(apdu_request, apdu_response);
+ sr_search (apdu_request->u.searchRequest,
+ apdu_response->u.searchResponse);
+ if (!apdu_response->u.searchResponse->records)
+ {
+ fetch_via_piggyback(s, apdu_request->u.searchRequest,
+ apdu_response->u.searchResponse);
+ }
+ s->send_Z_PDU(apdu_response, 0);
+ return 1;
case Z_APDU_presentRequest:
- yaz_log (LOG_LOG, "got PresentRequest p=%p", this);
- apdu_response = s->create_Z_PDU(Z_APDU_presentResponse);
- sr_present (apdu_request->u.presentRequest,
- apdu_response->u.presentResponse);
- if (!apdu_response->u.presentResponse->records)
- fetch_via_present(apdu_request->u.presentRequest,
- apdu_response->u.presentResponse);
- s->send_Z_PDU(apdu_response);
- return 1;
+ apdu_response = s->create_Z_PDU(Z_APDU_presentResponse);
+ s->transfer_referenceId(apdu_request, apdu_response);
+ sr_present (apdu_request->u.presentRequest,
+ apdu_response->u.presentResponse);
+ if (!apdu_response->u.presentResponse->records)
+ fetch_via_present(s, apdu_request->u.presentRequest,
+ apdu_response->u.presentResponse);
+ s->send_Z_PDU(apdu_response, 0);
+ return 1;
}
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+