-/* $Id: filter_record_transform.cpp,v 1.1 2006-10-03 14:04:22 marc Exp $
+/* $Id: filter_record_transform.cpp,v 1.3 2006-10-04 14:04:00 marc Exp $
Copyright (c) 2005-2006, Index Data.
See the LICENSE file for details
#include "package.hpp"
#include "util.hpp"
#include "gduutil.hpp"
+#include "xmlutil.hpp"
#include <yaz/zgdu.h>
+#include <yaz/retrieval.h>
//#include <boost/thread/mutex.hpp>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
+namespace mp_util = metaproxy_1::util;
namespace metaproxy_1 {
namespace filter {
void process(metaproxy_1::Package & package) const;
void configure(const xmlNode * xml_node);
private:
-
+ yaz_retrieval_t m_retrieval;
};
}
}
-yf::RecordTransform::Impl::Impl()
+yf::RecordTransform::Impl::Impl()
{
+ m_retrieval = yaz_retrieval_create();
+ assert(m_retrieval);
}
yf::RecordTransform::Impl::~Impl()
{
+ if (m_retrieval)
+ yaz_retrieval_destroy(m_retrieval);
}
void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
{
-// for (xml_node = xml_node->children; xml_node; xml_node = xml_node->next)
-// {
-// if (xml_node->type != XML_ELEMENT_NODE)
-// continue;
-// if (!strcmp((const char *) xml_node->name, "target"))
-// {
-// std::string route = mp::xml::get_route(xml_node);
-// std::string target = mp::xml::get_text(xml_node);
-// std::cout << "route=" << route << " target=" << target << "\n";
-// m_p->m_target_route[target] = route;
-// }
-// else if (!strcmp((const char *) xml_node->name, "hideunavailable"))
-// {
-// m_p->m_hide_unavailable = true;
-// }
-// else
-// {
-// throw mp::filter::FilterException
-// ("Bad element "
-// + std::string((const char *) xml_node->name)
-// + " in virt_db filter");
-// }
-// }
+ //const char *srcdir = getenv("srcdir");
+ //if (srcdir)
+ // yaz_retrieval_set_path(m_retrieval, srcdir);
+
+ if (!xml_node)
+ throw mp::XMLError("RecordTransform filter config: empty XML DOM");
+
+ // parsing down to retrieval node, which can be any of the children nodes
+ xmlNode *retrieval_node;
+ for (retrieval_node = xml_node->children;
+ retrieval_node;
+ retrieval_node = retrieval_node->next)
+ {
+ if (retrieval_node->type != XML_ELEMENT_NODE)
+ continue;
+ if (0 == strcmp((const char *) retrieval_node->name, "retrievalinfo"))
+ break;
+ }
+
+ // read configuration
+ if ( 0 != yaz_retrieval_configure(m_retrieval, retrieval_node)){
+ std::string msg("RecordTransform filter config: ");
+ msg += yaz_retrieval_get_error(m_retrieval);
+ throw mp::XMLError(msg);
+ }
}
void yf::RecordTransform::Impl::process(mp::Package &package) const
{
- Z_GDU *gdu = package.request().get();
+ Z_GDU *gdu_req = package.request().get();
// only working on z3950 present packages
- if (!gdu
- || !(gdu->which == Z_GDU_Z3950)
- || !(gdu->u.z3950->which == Z_APDU_presentRequest))
+ if (!gdu_req
+ || !(gdu_req->which == Z_GDU_Z3950)
+ || !(gdu_req->u.z3950->which == Z_APDU_presentRequest))
{
package.move();
return;
}
// getting original present request
- Z_PresentRequest *front_pr = gdu->u.z3950->u.presentRequest;
+ Z_PresentRequest *pr = gdu_req->u.z3950->u.presentRequest;
// setting up ODR's for memory during encoding/decoding
- mp::odr odr_de(ODR_DECODE);
+ //mp::odr odr_de(ODR_DECODE);
mp::odr odr_en(ODR_ENCODE);
- // now packaging the z3950 backend present request
- Package back_package(package.session(), package.origin());
- back_package.copy_filter(package);
-
- Z_APDU *apdu = zget_APDU(odr_en, Z_APDU_presentRequest);
+ // setting up variables for conversion state
+ yaz_record_conv_t rc = 0;
+ int ret_code;
- assert(apdu->u.presentRequest);
+ const char *input_schema = 0;
+ Odr_oid *input_syntax = 0;
- // z3950'fy start record position
- //if ()
- // *(apdu->u.presentRequest->resultSetStartPoint)
- // =
+ if(pr->recordComposition){
+ input_schema
+ = mp_util::record_composition_to_esn(pr->recordComposition);
+ }
+ if(pr->preferredRecordSyntax){
+ input_syntax = pr->preferredRecordSyntax;
+ }
- // z3950'fy number of records requested
- //if ()
- // *(apdu->u.presentRequest->numberOfRecordsRequested)
+ const char *match_schema = 0;
+ int *match_syntax = 0;
+
+ const char *backend_schema = 0;
+ Odr_oid *backend_syntax = 0;
+
+ ret_code
+ = yaz_retrieval_request(m_retrieval,
+ input_schema, input_syntax,
+ &match_schema, &match_syntax,
+ &rc,
+ &backend_schema, &backend_syntax);
+
+ std::cout << "ret_code " << ret_code << "\n";
+ std::cout << "match " << (oid_getentbyoid(match_syntax))->desc << " " << match_schema << "\n";
+ std::cout << "backend " << (oid_getentbyoid(backend_syntax))->desc << " " << backend_schema << "\n";
+
+
+// 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;
+// }
+
+
+ // now re-insructing the z3950 backend present request
// z3950'fy record syntax
- //if()
- //(apdu->u.presentRequest->preferredRecordSyntax)
- // = yaz_oidval_to_z3950oid (odr_en, CLASS_RECSYN, VAL_TEXT_XML);
+ //Odr_oid odr_oid;
+
+
+ // = yaz_oidval_to_z3950oid (odr_en, CLASS_RECSYN, VAL_TEXT_XML);
+ // }
+ // Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class,
+ // const char *str);
+ // const char *yaz_z3950oid_to_str (Odr_oid *oid, int *oid_class);
+
// z3950'fy record schema
//if ()
// {
- // apdu->u.presentRequest->recordComposition
+ // pr->recordComposition
// = (Z_RecordComposition *)
// odr_malloc(odr_en, sizeof(Z_RecordComposition));
- // apdu->u.presentRequest->recordComposition->which
+ // pr->recordComposition->which
// = Z_RecordComp_simple;
- // apdu->u.presentRequest->recordComposition->u.simple
+ // pr->recordComposition->u.simple
// = build_esn_from_schema(odr_en,
// (const char *) sr_req->recordSchema);
// }
// attaching Z3950 package to filter chain
- back_package.request() = apdu;
+ package.request() = gdu_req;
// std::cout << "z3950_present_request " << *apdu << "\n";
- // sending backend package
- back_package.move();
+ // sending package
+ package.move();
//check successful Z3950 present response
- Z_GDU *back_gdu = back_package.response().get();
- if (!back_gdu || back_gdu->which != Z_GDU_Z3950
- || back_gdu->u.z3950->which != Z_APDU_presentResponse
- || !back_gdu->u.z3950->u.presentResponse)
+ Z_GDU *gdu_res = package.response().get();
+ if (!gdu_res || gdu_res->which != Z_GDU_Z3950
+ || gdu_res->u.z3950->which != Z_APDU_presentResponse
+ || !gdu_res->u.z3950->u.presentResponse)
{
std::cout << "record-transform: error back present\n";
// everything fine, continuing
// std::cout << "z3950_present_request OK\n";
- // std::cout << "back z3950 " << *back_gdu << "\n";
+ // std::cout << "back z3950 " << *gdu_res << "\n";
+// 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;
return;
}
projects / metaproxy-moved-to-github.git / blobdiff