X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_record_transform.cpp;h=47467e5392054454c5383e924a2731bb09740130;hb=695f7ee27654f331d984b6c4b4400a8852ace102;hp=fe5ac244e08ca1e7d70adcc40e77363f67f7c4f9;hpb=f7ec9938e6ab4a92690024a53cede9a8b67e6920;p=metaproxy-moved-to-github.git diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp index fe5ac24..47467e5 100644 --- a/src/filter_record_transform.cpp +++ b/src/filter_record_transform.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_record_transform.cpp,v 1.4 2006-10-05 12:17:24 marc Exp $ +/* $Id: filter_record_transform.cpp,v 1.7 2006-12-12 11:01:40 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details @@ -12,6 +12,7 @@ #include "gduutil.hpp" #include "xmlutil.hpp" +#include #include #include @@ -94,7 +95,7 @@ void yf::RecordTransform::Impl::configure(const xmlNode *xml_node) 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: "); @@ -118,7 +119,7 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const } // getting original present request - Z_PresentRequest *pr = gdu_req->u.z3950->u.presentRequest; + Z_PresentRequest *pr_req = gdu_req->u.z3950->u.presentRequest; // setting up ODR's for memory during encoding/decoding //mp::odr odr_de(ODR_DECODE); @@ -131,12 +132,12 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const const char *input_schema = 0; Odr_oid *input_syntax = 0; - if(pr->recordComposition){ + if(pr_req->recordComposition){ input_schema - = mp_util::record_composition_to_esn(pr->recordComposition); + = mp_util::record_composition_to_esn(pr_req->recordComposition); } - if(pr->preferredRecordSyntax){ - input_syntax = pr->preferredRecordSyntax; + if(pr_req->preferredRecordSyntax){ + input_syntax = pr_req->preferredRecordSyntax; } const char *match_schema = 0; @@ -145,7 +146,6 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const const char *backend_schema = 0; Odr_oid *backend_syntax = 0; - std::cout << "yaz_retrieval_request" << "\n"; ret_code = yaz_retrieval_request(m_retrieval, input_schema, input_syntax, @@ -153,73 +153,39 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const &rc, &backend_schema, &backend_syntax); - std::cout << "ret_code " << ret_code << "\n"; - std::cout << "input " << input_syntax << " "; - if (input_syntax) - std::cout << (oid_getentbyoid(input_syntax))->desc << " "; - else - std::cout << "- "; - if (input_schema) - std::cout << input_schema << "\n"; - else - std::cout << "-\n"; - std::cout << "match " << match_syntax << " "; - if (match_syntax) - std::cout << (oid_getentbyoid(match_syntax))->desc << " "; - else - std::cout << "- "; - if (match_schema) - std::cout << match_schema << "\n"; - else - std::cout << "-\n"; - std::cout << "backend " << backend_syntax << " "; - if (backend_syntax) - std::cout << (oid_getentbyoid(backend_syntax))->desc << " "; - else - std::cout << "- "; - if (backend_schema) - std::cout << backend_schema << "\n"; - else - std::cout << "-\n"; - - // error handeling + // error handling if (ret_code != 0) { - // need to construct present error package and send back + Z_APDU *apdu = 0; + const char *details = 0; if (ret_code == -1) /* error ? */ { details = yaz_retrieval_get_error(m_retrieval); - std::cout << "ERROR: YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS" - << details << "\n"; - //rr->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; - // if (details) - // rr->errstring = odr_strdup(rr->stream, details); + apdu = odr_en.create_presentResponse( + gdu_req->u.z3950, + YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, details); } else if (ret_code == 1 || ret_code == 3) { details = input_schema; - std::cout << "ERROR: YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP" - << details << "\n"; - //rr->errcode = YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP; - //if (details) - // rr->errstring = odr_strdup(rr->stream, details); + apdu = odr_en.create_presentResponse( + gdu_req->u.z3950, + YAZ_BIB1_ELEMENT_SET_NAMES_UNSUPP, details); } else if (ret_code == 2) { - std::cout << "ERROR: YAZ_BIB1_RECORD_SYNTAX_UNSUPP" - << details << "\n"; - //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); - //} + char oidbuf[OID_STR_MAX]; + oid_to_dotstring(input_syntax, oidbuf); + details = odr_strdup(odr_en, oidbuf); + + apdu = odr_en.create_presentResponse( + gdu_req->u.z3950, + YAZ_BIB1_RECORD_SYNTAX_UNSUPP, details); } - //package.session().close(); + package.response() = apdu; return; } @@ -228,58 +194,32 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const // now re-coding the z3950 backend present request // z3950'fy record syntax - - if (backend_syntax) - pr->preferredRecordSyntax - = yaz_oidval_to_z3950oid(odr_en, CLASS_RECSYN, *backend_syntax); - else - pr->preferredRecordSyntax - = yaz_oidval_to_z3950oid(odr_en, CLASS_RECSYN, VAL_NONE); - - - //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); - - // 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; - - - + if (backend_syntax) // TODO: this seems not to work - why ?? + pr_req->preferredRecordSyntax = backend_syntax; + else + pr_req->preferredRecordSyntax + = yaz_oidval_to_z3950oid(odr_en, CLASS_RECSYN, VAL_NONE); + // z3950'fy record schema if (backend_schema) { - pr->recordComposition + pr_req->recordComposition = (Z_RecordComposition *) odr_malloc(odr_en, sizeof(Z_RecordComposition)); - pr->recordComposition->which + pr_req->recordComposition->which = Z_RecordComp_simple; - pr->recordComposition->u.simple + pr_req->recordComposition->u.simple = (Z_ElementSetNames *) odr_malloc(odr_en, sizeof(Z_ElementSetNames)); - pr->recordComposition->u.simple->which = Z_ElementSetNames_generic; - pr->recordComposition->u.simple->u.generic + pr_req->recordComposition->u.simple->which = Z_ElementSetNames_generic; + pr_req->recordComposition->u.simple->u.generic = odr_strdup(odr_en, backend_schema); } // attaching Z3950 package to filter chain package.request() = gdu_req; - // std::cout << "z3950_present_request " << *apdu << "\n"; - - // sending package package.move(); //check successful Z3950 present response @@ -299,53 +239,72 @@ void yf::RecordTransform::Impl::process(mp::Package &package) const // std::cout << "z3950_present_request OK\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); + Z_PresentResponse * pr_res = gdu_res->u.z3950->u.presentResponse; -// 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; + // let non surrogate dioagnostics in Z3950 present response package + // pass to frontend - just return + if (pr_res->records + && pr_res->records->which == Z_Records_NSD + && pr_res->records->u.nonSurrogateDiagnostic) + { + // we might do more clever tricks to "reverse" + // these error(s). + //*pr_res->records->u.nonSurrogateDiagnostic->condition = + // YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + } + + // record transformation must take place + if (rc && pr_res + && pr_res->numberOfRecordsReturned + && *(pr_res->numberOfRecordsReturned) > 0 + && pr_res->records + && pr_res->records->which == Z_Records_DBOSD + && pr_res->records->u.databaseOrSurDiagnostics->num_records) + { + //transform all records + for (int i = 0; + i < pr_res->records->u.databaseOrSurDiagnostics->num_records; + i++) + { + Z_NamePlusRecord *npr + = pr_res->records->u.databaseOrSurDiagnostics->records[i]; + if (npr->which == Z_NamePlusRecord_databaseRecord) + { + Z_External *r = npr->u.databaseRecord; + //oident *ent = oid_getentbyoid(r->direct_reference); + if (r->which == Z_External_octet) + { + WRBUF output_record = wrbuf_alloc(); + int ret_trans + = yaz_record_conv_record(rc, + (const char *) + r->u.octet_aligned->buf, + r->u.octet_aligned->len, + output_record); + if (ret_trans == 0) + { + struct oident *ident = oid_getentbyoid(match_syntax); + npr->u.databaseRecord = + z_ext_record(odr_en, ident->value, + wrbuf_buf(output_record), + wrbuf_len(output_record)); + } + else + { + pr_res->records-> + u.databaseOrSurDiagnostics->records[i] + = zget_surrogateDiagRec( + odr_en, npr->databaseName, + YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS, + yaz_record_conv_get_error(rc)); + } + wrbuf_free(output_record, 1); + } + } + } + } + package.response() = gdu_res; return; }