-/* $Id: pazpar2.c,v 1.70 2007-04-10 08:48:56 adam Exp $
+/* $Id: pazpar2.c,v 1.78 2007-04-13 11:13:08 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include <yaz/otherinfo.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
+#include <yaz/query-charset.h>
+#include <yaz/querytowrbuf.h>
+#if YAZ_VERSIONL >= 0x020163
+#include <yaz/oid_db.h>
+#endif
#if HAVE_CONFIG_H
#include "cconfig.h"
static int client_prep_connection(struct client *cl);
static void ingest_records(struct client *cl, Z_Records *r);
void session_alert_watch(struct session *s, int what);
-char *session_setting_oneval(struct session *s, struct database *db, int offset);
IOCHAN channel_list = 0; // Master list of connections we're handling events to
// TODO: Extend this to handle other schemes than open (should be simple)
static void init_authentication(struct client *cl, Z_InitRequest *req)
{
- struct database *db = cl->database;
- struct session *se = cl->session;
- char *auth = session_setting_oneval(se, db, PZ_AUTHENTICATION);
+ struct session_database *sdb = cl->database;
+ char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
if (auth)
{
/* add virtual host if tunneling through Z39.50 proxy */
if (0 < strlen(global_parameters.zproxy_override)
- && 0 < strlen(cl->database->url))
- yaz_oi_set_string_oidval(&a->u.initRequest->otherInfo,
+ && 0 < strlen(cl->database->database->url))
+ {
+#if YAZ_VERSIONL >= 0x020163
+ const int *oid_proxy = yaz_string_to_oid(yaz_oid_std(),
+ CLASS_USERINFO, OID_STR_PROXY);
+ yaz_oi_set_string_oid(&a->u.initRequest->otherInfo,
+ global_parameters.odr_out, oid_proxy,
+ 1, cl->database->database->url);
+#else
+ yaz_oi_set_string_oidval(&a->u.initRequest->otherInfo,
global_parameters.odr_out, VAL_PROXY,
- 1, cl->database->url);
+ 1, cl->database->database->url);
+#endif
+ }
if (send_apdu(cl, a) >= 0)
{
struct connection *co = iochan_getdata(i);
struct client *cl = co->client;
struct session *se = cl->session;
- struct database *db = cl->database;
+ struct session_database *sdb = cl->database;
Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_searchRequest);
int ndb, cerror, cpos;
char **databaselist;
Z_Query *zquery;
struct ccl_rpn_node *cn;
int ssub = 0, lslb = 100000, mspn = 10;
- char *recsyn;
- char *piggyback;
+ char *recsyn = 0;
+ char *piggyback = 0;
+ char *queryenc = 0;
+ yaz_iconv_t iconv = 0;
- yaz_log(YLOG_DEBUG, "Sending search");
+ yaz_log(YLOG_DEBUG, "Sending search to %s", cl->database->database->url);
- cn = ccl_find_str(db->ccl_map, se->query, &cerror, &cpos);
+ cn = ccl_find_str(sdb->database->ccl_map, se->query, &cerror, &cpos);
if (!cn)
return;
se->expected_maxrecs);
}
+ // constructing RPN query
a->u.searchRequest->query = zquery = odr_malloc(global_parameters.odr_out,
sizeof(Z_Query));
zquery->which = Z_Query_type_1;
zquery->u.type_1 = ccl_rpn_query(global_parameters.odr_out, cn);
ccl_rpn_delete(cn);
- for (ndb = 0; db->databases[ndb]; ndb++)
+ // converting to target encoding
+ if ((queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING))){
+ iconv = yaz_iconv_open(queryenc, "UTF-8");
+ if (iconv){
+ yaz_query_charset_convert_rpnquery(zquery->u.type_1,
+ global_parameters.odr_out,
+ iconv);
+ yaz_iconv_close(iconv);
+ } else
+ yaz_log(YLOG_WARN, "Query encoding failed %s %s",
+ cl->database->database->url, queryenc);
+ }
+
+ for (ndb = 0; sdb->database->databases[ndb]; ndb++)
;
databaselist = odr_malloc(global_parameters.odr_out, sizeof(char*) * ndb);
- for (ndb = 0; db->databases[ndb]; ndb++)
- databaselist[ndb] = db->databases[ndb];
+ for (ndb = 0; sdb->database->databases[ndb]; ndb++)
+ databaselist[ndb] = sdb->database->databases[ndb];
- if (!(piggyback = session_setting_oneval(se, db, PZ_PIGGYBACK)) || *piggyback == '1')
+ if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) || *piggyback == '1')
{
- if ((recsyn = session_setting_oneval(se, db, PZ_REQUESTSYNTAX)))
+ if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
+ {
+#if YAZ_VERSIONL >= 0x020163
+ a->u.searchRequest->preferredRecordSyntax =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recsyn,
+ global_parameters.odr_out);
+#else
a->u.searchRequest->preferredRecordSyntax =
- yaz_str_to_z3950oid(global_parameters.odr_out,
- CLASS_RECSYN, recsyn);
+ yaz_str_to_z3950oid(global_parameters.odr_out,
+ CLASS_RECSYN, recsyn);
+#endif
+ }
a->u.searchRequest->smallSetUpperBound = &ssub;
a->u.searchRequest->largeSetLowerBound = &lslb;
a->u.searchRequest->mediumSetPresentNumber = &mspn;
a->u.searchRequest->databaseNames = databaselist;
a->u.searchRequest->num_databaseNames = ndb;
- if (send_apdu(cl, a) >= 0)
- {
- iochan_setflags(i, EVENT_INPUT);
- cl->state = Client_Searching;
- cl->requestid = se->requestid;
- }
- else
- cl->state = Client_Error;
+
+ { //scope for sending and logging queries
+ WRBUF wbquery = wrbuf_alloc();
+ yaz_query_to_wrbuf(wbquery, zquery);
+
+
+ if (send_apdu(cl, a) >= 0)
+ {
+ iochan_setflags(i, EVENT_INPUT);
+ cl->state = Client_Searching;
+ cl->requestid = se->requestid;
+ yaz_log(YLOG_LOG, "SearchRequest %s %s %s",
+ cl->database->database->url,
+ queryenc ? queryenc : "UTF-8",
+ wrbuf_cstr(wbquery));
+ }
+ else {
+ cl->state = Client_Error;
+ yaz_log(YLOG_WARN, "Failed SearchRequest %s %s %s",
+ cl->database->database->url,
+ queryenc ? queryenc : "UTF-8",
+ wrbuf_cstr(wbquery));
+ }
+
+ wrbuf_destroy(wbquery);
+ }
odr_reset(global_parameters.odr_out);
}
{
struct connection *co = iochan_getdata(i);
struct client *cl = co->client;
- struct session *se = cl->session;
- struct database *db = cl->database;
+ struct session_database *sdb = cl->database;
Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest);
int toget;
int start = cl->records + 1;
a->u.presentRequest->resultSetId = "Default";
- if ((recsyn = session_setting_oneval(se, db, PZ_REQUESTSYNTAX)))
+ if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX)))
+ {
+#if YAZ_VERSIONL >= 0x020163
a->u.presentRequest->preferredRecordSyntax =
- yaz_str_to_z3950oid(global_parameters.odr_out,
- CLASS_RECSYN, recsyn);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recsyn,
+ global_parameters.odr_out);
+#else
+ a->u.presentRequest->preferredRecordSyntax =
+ yaz_str_to_z3950oid(global_parameters.odr_out,
+ CLASS_RECSYN, recsyn);
+#endif
+ }
if (send_apdu(cl, a) >= 0)
{
struct client *cl = co->client;
Z_InitResponse *r = a->u.initResponse;
- yaz_log(YLOG_DEBUG, "Init response %s", cl->database->url);
+ yaz_log(YLOG_DEBUG, "Init response %s", cl->database->database->url);
if (*r->result)
{
Z_SearchResponse *r = a->u.searchResponse;
yaz_log(YLOG_DEBUG, "Search response %s (status=%d)",
- cl->database->url, *r->searchStatus);
+ cl->database->database->url, *r->searchStatus);
if (*r->searchStatus)
{
if (r->presentStatus && !*r->presentStatus && r->records)
{
yaz_log(YLOG_DEBUG, "Records in search response %s",
- cl->database->url);
+ cl->database->database->url);
ingest_records(cl, r->records);
}
cl->state = Client_Idle;
{
yaz_log(YLOG_WARN,
"Search response: Non-surrogate diagnostic %s",
- cl->database->url);
+ cl->database->database->url);
cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition;
cl->state = Client_Error;
}
struct client *cl = co->client;
/* Z_Close *r = a->u.close; */
- yaz_log(YLOG_WARN, "Close response %s", cl->database->url);
+ yaz_log(YLOG_WARN, "Close response %s", cl->database->database->url);
cl->state = Client_Failed;
connection_destroy(co);
static xmlDoc *normalize_record(struct client *cl, Z_External *rec)
{
struct database_retrievalmap *m;
- struct database *db = cl->database;
+ struct database *db = cl->database->database;
xmlNode *res;
xmlDoc *rdoc;
if (rec->which != Z_External_octet)
{
yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s",
- cl->database->url);
+ cl->database->database->url);
return 0;
}
buf = (char*) rec->u.octet_aligned->buf;
if (yaz_marc_read_iso2709(db->yaz_marc, buf, len) < 0)
{
yaz_log(YLOG_WARN, "Failed to decode MARC %s",
- cl->database->url);
+ cl->database->database->url);
return 0;
}
+
+ yaz_marc_write_using_libxml2(db->yaz_marc, 1);
if (yaz_marc_write_xml(db->yaz_marc, &res,
"http://www.loc.gov/MARC21/slim", 0, 0) < 0)
{
yaz_log(YLOG_WARN, "Failed to encode as XML %s",
- cl->database->url);
+ cl->database->database->url);
return 0;
}
rdoc = xmlNewDoc((xmlChar *) "1.0");
xmlDocSetRootElement(rdoc, res);
+
}
else
{
- yaz_log(YLOG_FATAL, "Unknown native_syntax in normalize_record");
+ yaz_log(YLOG_FATAL,
+ "Unknown native_syntax in normalize_record from %s",
+ cl->database->database->url);
exit(1);
}
- if (global_parameters.dump_records)
- {
- fprintf(stderr, "Input Record (normalized):\n----------------\n");
+ if (global_parameters.dump_records){
+ fprintf(stderr,
+ "Input Record (normalized) from %s\n----------------\n",
+ cl->database->database->url);
#if LIBXML_VERSION >= 20600
xmlDocFormatDump(stderr, rdoc, 1);
#else
#endif
}
- for (m = db->map; m; m = m->next)
- {
- xmlDoc *new;
- if (!(new = xsltApplyStylesheet(m->stylesheet, rdoc, 0)))
+ for (m = db->map; m; m = m->next){
+ xmlDoc *new = 0;
+
+#if 1
+ {
+ xmlNodePtr root = 0;
+ new = xsltApplyStylesheet(m->stylesheet, rdoc, 0);
+ root= xmlDocGetRootElement(new);
+ if (!new || !root || !(root->children))
{
- yaz_log(YLOG_WARN, "XSLT transformation failed");
+ yaz_log(YLOG_WARN, "XSLT transformation failed from %s",
+ cl->database->database->url);
+ xmlFreeDoc(new);
+ xmlFreeDoc(rdoc);
return 0;
}
+ }
+#endif
+
+#if 0
+ // do it another way to detect transformation errors right now
+ // but does not seem to work either!
+ {
+ xsltTransformContextPtr ctxt;
+ ctxt = xsltNewTransformContext(m->stylesheet, rdoc);
+ new = xsltApplyStylesheetUser(m->stylesheet, rdoc, 0, 0, 0, ctxt);
+ if ((ctxt->state == XSLT_STATE_ERROR) ||
+ (ctxt->state == XSLT_STATE_STOPPED)){
+ yaz_log(YLOG_WARN, "XSLT transformation failed from %s",
+ cl->database->database->url);
+ xmlFreeDoc(new);
+ xmlFreeDoc(rdoc);
+ return 0;
+ }
+ }
+#endif
+
xmlFreeDoc(rdoc);
rdoc = new;
}
if (global_parameters.dump_records)
{
- fprintf(stderr, "Record:\n----------------\n");
+ fprintf(stderr, "Record from %s\n----------------\n",
+ cl->database->database->url);
#if LIBXML_VERSION >= 20600
xmlDocFormatDump(stderr, rdoc, 1);
#else
&se->total_merged);
if (global_parameters.dump_records)
yaz_log(YLOG_LOG, "Cluster id %d from %s (#%d)", cluster->recid,
- cl->database->url, cl->records);
+ cl->database->database->url, cl->records);
if (!cluster)
{
/* no room for record */
// Retrieve first defined value for 'name' for given database.
// Will be extended to take into account user associated with session
-char *session_setting_oneval(struct session *s, struct database *db, int offset)
+char *session_setting_oneval(struct session_database *db, int offset)
{
if (!db->settings[offset])
- return 0;
+ return "";
return db->settings[offset]->value;
}
{
yaz_log(YLOG_WARN,
"Unexpected record type, probably diagnostic %s",
- cl->database->url);
+ cl->database->database->url);
continue;
}
if (recs->which == Z_Records_NSD)
{
yaz_log(YLOG_WARN, "Non-surrogate diagnostic %s",
- cl->database->url);
+ cl->database->database->url);
cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition;
cl->state = Client_Error;
}
if (!*r->presentStatus && cl->state != Client_Error)
{
yaz_log(YLOG_DEBUG, "Good Present response %s",
- cl->database->url);
+ cl->database->database->url);
ingest_records(cl, r->records);
cl->state = Client_Idle;
}
else if (*r->presentStatus)
{
yaz_log(YLOG_WARN, "Bad Present response %s",
- cl->database->url);
+ cl->database->database->url);
cl->state = Client_Error;
}
}
if (len < 0)
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "Error reading from %s",
- cl->database->url);
+ cl->database->database->url);
connection_destroy(co);
return;
}
else if (len == 0)
{
- yaz_log(YLOG_WARN, "EOF reading from %s", cl->database->url);
+ yaz_log(YLOG_WARN, "EOF reading from %s", cl->database->database->url);
connection_destroy(co);
return;
}
default:
yaz_log(YLOG_WARN,
"Unexpected Z39.50 response from %s",
- cl->database->url);
+ cl->database->database->url);
client_fatal(cl);
return;
}
if (0 == strlen(global_parameters.zproxy_override)){
/* no Z39.50 proxy needed - direct connect */
- yaz_log(YLOG_DEBUG, "Connection create %s", cl->database->url);
+ yaz_log(YLOG_DEBUG, "Connection create %s", cl->database->database->url);
- if (!(addr = cs_straddr(link, cl->database->host->ipport)))
+ if (!(addr = cs_straddr(link, cl->database->database->host->ipport)))
{
yaz_log(YLOG_WARN|YLOG_ERRNO,
"Lookup of IP address %s failed",
- cl->database->host->ipport);
+ cl->database->database->host->ipport);
return 0;
}
} else {
/* Z39.50 proxy connect */
yaz_log(YLOG_DEBUG, "Connection create %s proxy %s",
- cl->database->url, global_parameters.zproxy_override);
+ cl->database->database->url, global_parameters.zproxy_override);
if (!(addr = cs_straddr(link, global_parameters.zproxy_override)))
{
res = cs_connect(link, addr);
if (res < 0)
{
- yaz_log(YLOG_WARN|YLOG_ERRNO, "cs_connect %s", cl->database->url);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "cs_connect %s", cl->database->database->url);
return 0;
}
new->ibufsize = 0;
}
new->state = Conn_Connecting;
- new->host = cl->database->host;
+ new->host = cl->database->database->host;
new->next = new->host->connections;
new->host->connections = new;
new->client = cl;
// Close connection and set state to error
static void client_fatal(struct client *cl)
{
- yaz_log(YLOG_WARN, "Fatal error from %s", cl->database->url);
+ yaz_log(YLOG_WARN, "Fatal error from %s", cl->database->database->url);
connection_destroy(cl->connection);
cl->state = Client_Error;
}
{
struct connection *co;
struct session *se = cl->session;
- struct host *host = cl->database->host;
+ struct host *host = cl->database->database->host;
co = cl->connection;
- yaz_log(YLOG_DEBUG, "Client prep %s", cl->database->url);
+ yaz_log(YLOG_DEBUG, "Client prep %s", cl->database->database->url);
if (!co)
{
}
//callback for grep_databases
-static void select_targets_callback(void *context, struct database *db)
+static void select_targets_callback(void *context, struct session_database *db)
{
struct session *se = (struct session*) context;
struct client *cl = client_create();
}
// Associates a set of clients with a session;
+// Note: Session-databases represent databases with per-session setting overrides
int select_targets(struct session *se, struct database_criterion *crit)
{
while (se->clients)
client_destroy(se->clients);
- return grep_databases(se, crit, select_targets_callback);
+ return session_grep_databases(se, crit, select_targets_callback);
}
int session_active_clients(struct session *s)
return 0;
}
+// Apply a session override to a database
+void session_apply_setting(struct session *se, char *dbname, char *setting, char *value)
+{
+ struct session_database *sdb;
+
+ for (sdb = se->databases; sdb; sdb = sdb->next)
+ if (!strcmp(dbname, sdb->database->url))
+ {
+ struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new));
+ int offset = settings_offset(setting);
+
+ if (offset < 0)
+ {
+ yaz_log(YLOG_WARN, "Unknown setting %s", setting);
+ return;
+ }
+ new->precedence = 0;
+ new->target = dbname;
+ new->name = setting;
+ new->value = value;
+ new->next = sdb->settings[offset];
+ sdb->settings[offset] = new;
+ break;
+ }
+ if (!sdb)
+ yaz_log(YLOG_WARN, "Unknown database in setting override: %s", dbname);
+}
+
+void session_init_databases_fun(void *context, struct database *db)
+{
+ struct session *se = (struct session *) context;
+ struct session_database *new = nmem_malloc(se->session_nmem, sizeof(*new));
+ int num = settings_num();
+ int i;
+
+ new->database = db;
+ new->settings = nmem_malloc(se->session_nmem, sizeof(struct settings *) * num);
+ for (i = 0; i < num; i++)
+ new->settings[i] = db->settings[i];
+ new->next = se->databases;
+ se->databases = new;
+}
+
+// Initialize session_database list -- this represents this session's view
+// of the database list -- subject to modification by the settings ws command
+void session_init_databases(struct session *se)
+{
+ se->databases = 0;
+ grep_databases(se, 0, session_init_databases_fun);
+}
+
void destroy_session(struct session *s)
{
yaz_log(YLOG_LOG, "Destroying session");
session->session_nmem = nmem;
session->nmem = nmem_create();
session->wrbuf = wrbuf_alloc();
+ session_init_databases(session);
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{
session->watchlist[i].data = 0;
*count = 0;
for (cl = se->clients; cl; cl = cl->next)
{
- res[*count].id = cl->database->url;
- res[*count].name = cl->database->name;
+ char *name = session_setting_oneval(cl->database, PZ_NAME);
+
+ res[*count].id = cl->database->database->url;
+ res[*count].name = *name ? name : "Unknown";
res[*count].hits = cl->hits;
res[*count].records = cl->records;
res[*count].diagnostic = cl->diagnostic;
projects / pazpar2-moved-to-github.git / blobdiff