#include <stdlib.h>
#include <sys/types.h>
#include "filter_zoom.hpp"
-#include <yaz/zoom.h>
-#include <yaz/yaz-version.h>
-#include <yaz/tpath.h>
-#include <yaz/srw.h>
#include <metaproxy/package.hpp>
#include <metaproxy/util.hpp>
#include <metaproxy/xmlutil.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
+
+#include <yaz/yaz-version.h>
+#include <yaz/tpath.h>
+#include <yaz/srw.h>
#include <yaz/ccl_xml.h>
#include <yaz/ccl.h>
#include <yaz/rpn2cql.h>
#include <yaz/querytowrbuf.h>
#include <yaz/sortspec.h>
#include <yaz/tokenizer.h>
+#include <yaz/zoom.h>
namespace mp = metaproxy_1;
namespace yf = mp::filter;
friend class Impl;
friend class Frontend;
std::string zurl;
+ WRBUF m_apdu_wrbuf;
ZOOM_connection m_connection;
ZOOM_resultset m_resultset;
std::string m_frontend_database;
void handle_package(mp::Package &package);
void handle_search(mp::Package &package);
void handle_present(mp::Package &package);
- BackendPtr get_backend_from_databases(const mp::Package &package,
+ BackendPtr get_backend_from_databases(mp::Package &package,
std::string &database,
int *error,
char **addinfo,
ODR odr);
-
+ bool create_content_session(mp::Package &package,
+ BackendPtr b,
+ int *error,
+ char **addinfo,
+ ODR odr,
+ std::string authentication,
+ std::string proxy);
+
void prepare_elements(BackendPtr b,
Odr_oid *preferredRecordSyntax,
const char *element_set_name,
yf::Zoom::Backend::Backend(SearchablePtr ptr) : sptr(ptr)
{
+ m_apdu_wrbuf = wrbuf_alloc();
m_connection = ZOOM_connection_create(0);
+ ZOOM_connection_save_apdu_wrbuf(m_connection, m_apdu_wrbuf);
m_resultset = 0;
xsp = 0;
}
{
strcat(*addinfo, ": ");
strcat(*addinfo, zoom_addinfo);
- strcat(*addinfo, " ");
}
}
else
piggyback = true;
use_turbomarc = true;
sortStrategy = "embed";
+ urlRecipe = "${md-electronic-url}";
ccl_bibset = ccl_qual_dup(base);
}
{
s->sru = mp::xml::get_text(ptr);
}
- else if (!strcmp((const char *) ptr->name, "SRUVersion"))
+ else if (!strcmp((const char *) ptr->name, "SRUVersion") ||
+ !strcmp((const char *) ptr->name, "sruVersion"))
{
s->sru_version = mp::xml::get_text(ptr);
}
}
}
+bool yf::Zoom::Frontend::create_content_session(mp::Package &package,
+ BackendPtr b,
+ int *error, char **addinfo,
+ ODR odr,
+ std::string authentication,
+ std::string proxy)
+{
+ if (b->sptr->contentConnector.length())
+ {
+ char *fname = (char *) xmalloc(m_p->content_tmp_file.length() + 8);
+ strcpy(fname, m_p->content_tmp_file.c_str());
+ char *xx = strstr(fname, "XXXXXX");
+ if (!xx)
+ {
+ xx = fname + strlen(fname);
+ strcat(fname, "XXXXXX");
+ }
+ char tmp_char = xx[6];
+ sprintf(xx, "%06d", ((unsigned) rand()) % 1000000);
+ xx[6] = tmp_char;
+
+ FILE *file = fopen(fname, "w");
+ if (!file)
+ {
+ package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname);
+ *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname));
+ sprintf(*addinfo, "Could not create %s", fname);
+ xfree(fname);
+ return false;
+ }
+ b->content_session_id.assign(xx, 6);
+ WRBUF w = wrbuf_alloc();
+ wrbuf_puts(w, "#content_proxy\n");
+ wrbuf_printf(w, "connector: %s\n", b->sptr->contentConnector.c_str());
+ if (authentication.length())
+ wrbuf_printf(w, "auth: %s\n", authentication.c_str());
+ if (proxy.length())
+ wrbuf_printf(w, "proxy: %s\n", proxy.c_str());
+
+ fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file);
+ fclose(file);
+ package.log("zoom", YLOG_LOG, "content file: %s", fname);
+ xfree(fname);
+ }
+ return true;
+}
+
yf::Zoom::BackendPtr yf::Zoom::Frontend::get_backend_from_databases(
- const mp::Package &package,
+ mp::Package &package,
std::string &database, int *error, char **addinfo, ODR odr)
{
std::list<BackendPtr>::const_iterator map_it;
torus_db = database;
std::string authentication;
+ std::string content_authentication;
std::string proxy;
std::string realm = m_p->default_realm;
const char *param_user = 0;
const char *param_password = 0;
+ const char *param_content_user = 0;
+ const char *param_content_password = 0;
int no_parms = 0;
char **names;
param_user = value;
else if (!strcmp(name, "password"))
param_password = value;
+ else if (!strcmp(name, "content-user"))
+ param_content_user = value;
+ else if (!strcmp(name, "content-password"))
+ param_content_password = value;
else if (!strcmp(name, "proxy"))
proxy = value;
else if (!strcmp(name, "cproxysession"))
if (param_password)
authentication += "/" + std::string(param_password);
}
+ if (param_content_user)
+ {
+ content_authentication = std::string(param_content_user);
+ if (param_content_password)
+ content_authentication += "/" + std::string(param_content_password);
+ }
SearchablePtr sptr;
std::map<std::string,SearchablePtr>::iterator it;
if (proxy.length())
b->set_option("proxy", proxy);
}
- if (b->sptr->contentConnector.length())
- {
- char *fname = (char *) xmalloc(m_p->content_tmp_file.length() + 8);
- strcpy(fname, m_p->content_tmp_file.c_str());
- char *xx = strstr(fname, "XXXXXX");
- if (!xx)
- {
- xx = fname + strlen(fname);
- strcat(fname, "XXXXXX");
- }
- char tmp_char = xx[6];
- sprintf(xx, "%06d", ((unsigned) rand()) % 1000000);
- xx[6] = tmp_char;
-
- FILE *file = fopen(fname, "w");
- if (!file)
- {
- package.log("zoom", YLOG_WARN|YLOG_ERRNO, "create %s", fname);
- *error = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
- *addinfo = (char *) odr_malloc(odr, 40 + strlen(fname));
- sprintf(*addinfo, "Could not create %s", fname);
- xfree(fname);
- BackendPtr backend_null;
- return backend_null;
- }
- b->content_session_id.assign(xx, 6);
- WRBUF w = wrbuf_alloc();
- wrbuf_puts(w, "#content_proxy\n");
- wrbuf_printf(w, "connector: %s\n", b->sptr->contentConnector.c_str());
- if (authentication.length())
- wrbuf_printf(w, "auth: %s\n", authentication.c_str());
- if (proxy.length())
- wrbuf_printf(w, "proxy: %s\n", proxy.c_str());
- if (sptr->cfProxy.length())
- wrbuf_printf(w, "cfproxy: %s\n", sptr->cfProxy.c_str());
-
- fwrite(wrbuf_buf(w), 1, wrbuf_len(w), file);
- fclose(file);
- package.log("zoom", YLOG_LOG, "file %s created\n", fname);
- xfree(fname);
- }
-
std::string url;
if (sptr->sru.length())
{
(char **) out_values);
url += "," + std::string(x_args);
}
- package.log("zoom", YLOG_LOG, "url=%s", url.c_str());
+ package.log("zoom", YLOG_LOG, "url: %s", url.c_str());
b->connect(url, error, addinfo, odr);
if (*error == 0)
- {
+ create_content_session(package, b, error, addinfo, odr,
+ content_authentication.length() ?
+ content_authentication : authentication, proxy);
+ if (*error == 0)
m_backend = b;
- }
return b;
}
const char *cql = query->u.type_104->u.cql;
CQL_parser cp = cql_parser_create();
int r = cql_parser_string(cp, cql);
+ package.log("zoom", YLOG_LOG, "CQL: %s", cql);
if (r)
{
cql_parser_destroy(cp);
+ package.log("zoom", YLOG_WARN, "CQL syntax error");
apdu_res =
odr.create_searchResponse(apdu_req,
YAZ_BIB1_MALFORMED_QUERY,
else if (gdu->which == Z_GDU_Z3950)
{
Z_APDU *apdu_req = gdu->u.z3950;
+
+ if (m_backend)
+ wrbuf_rewind(m_backend->m_apdu_wrbuf);
if (apdu_req->which == Z_APDU_initRequest)
{
mp::odr odr;
"zoom filter cannot handle this APDU");
package.session().close();
}
+ if (m_backend)
+ {
+ WRBUF w = m_backend->m_apdu_wrbuf;
+ package.log_write(wrbuf_buf(w), wrbuf_len(w));
+ }
}
else
{
projects / metaproxy-moved-to-github.git / blobdiff