-/* $Id: pazpar2.c,v 1.62 2007-04-04 21:05:37 marc Exp $ */
+/* $Id: pazpar2.c,v 1.65 2007-04-08 21:51:58 quinn Exp $ */
#include <stdlib.h>
#include <stdio.h>
static void connection_destroy(struct connection *co);
static int client_prep_connection(struct client *cl);
static void ingest_records(struct client *cl, Z_Records *r);
-//static struct conf_retrievalprofile *database_retrieval_profile(struct database *db);
void session_alert_watch(struct session *s, int what);
-char *session_setting_oneval(struct session *s, struct database *db, const char *name);
+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
100,
MAX_CHUNK,
0,
- 0,
0
};
return 0;
}
+// Set authentication token in init if one is set for the client
+// 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);
+
+ if (auth)
+ {
+ Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
+ sizeof(*idAuth));
+ idAuth->which = Z_IdAuthentication_open;
+ idAuth->u.open = auth;
+ req->idAuthentication = idAuth;
+ }
+}
static void send_init(IOCHAN i)
{
ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_2);
ODR_MASK_SET(a->u.initRequest->protocolVersion, Z_ProtocolVersion_3);
+ init_authentication(cl, a->u.initRequest);
/* add virtual host if tunneling through Z39.50 proxy */
yaz_oi_set_string_oidval(&a->u.initRequest->otherInfo,
global_parameters.odr_out, VAL_PROXY,
1, cl->database->url);
-
-
if (send_apdu(cl, a) >= 0)
{
for (ndb = 0; db->databases[ndb]; ndb++)
databaselist[ndb] = db->databases[ndb];
- if (!(piggyback = session_setting_oneval(se, db, "pz:piggyback")) || *piggyback == '1')
+ if (!(piggyback = session_setting_oneval(se, db, PZ_PIGGYBACK)) || *piggyback == '1')
{
- if ((recsyn = session_setting_oneval(se, db, "pz:syntax")))
+ if ((recsyn = session_setting_oneval(se, db, PZ_NATIVESYNTAX)))
a->u.searchRequest->preferredRecordSyntax =
yaz_str_to_z3950oid(global_parameters.odr_out,
CLASS_RECSYN, recsyn);
a->u.presentRequest->resultSetId = "Default";
- if ((recsyn = session_setting_oneval(se, db, "pz:syntax")))
+ if ((recsyn = session_setting_oneval(se, db, PZ_NATIVESYNTAX)))
a->u.presentRequest->preferredRecordSyntax =
yaz_str_to_z3950oid(global_parameters.odr_out,
CLASS_RECSYN, recsyn);
static xmlDoc *normalize_record(struct client *cl, Z_External *rec)
{
- struct conf_retrievalprofile *rprofile = cl->database->rprofile;
- struct conf_retrievalmap *m;
+ struct database_retrievalmap *m;
+ struct database *db = cl->database;
xmlNode *res;
xmlDoc *rdoc;
// First normalize to XML
- if (rprofile->native_syntax == Nativesyn_iso2709)
+ if (db->yaz_marc)
{
char *buf;
int len;
if (rec->which != Z_External_octet)
{
- yaz_log(YLOG_WARN, "Unexpected external branch, probably BER");
+ yaz_log(YLOG_WARN, "Unexpected external branch, probably BER %s",
+ cl->database->url);
return 0;
}
buf = (char*) rec->u.octet_aligned->buf;
len = rec->u.octet_aligned->len;
- if (yaz_marc_read_iso2709(rprofile->yaz_marc, buf, len) < 0)
+ if (yaz_marc_read_iso2709(db->yaz_marc, buf, len) < 0)
{
- yaz_log(YLOG_WARN, "Failed to decode MARC");
+ yaz_log(YLOG_WARN, "Failed to decode MARC %s",
+ cl->database->url);
return 0;
}
- if (yaz_marc_write_xml(rprofile->yaz_marc, &res,
+ 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");
+ yaz_log(YLOG_WARN, "Failed to encode as XML %s",
+ cl->database->url);
return 0;
}
rdoc = xmlNewDoc((xmlChar *) "1.0");
#endif
}
- for (m = rprofile->maplist; m; m = m->next)
+ for (m = db->map; m; m = m->next)
{
xmlDoc *new;
- if (m->type != Map_xslt)
- {
- yaz_log(YLOG_WARN, "Unknown map type");
- return 0;
- }
if (!(new = xsltApplyStylesheet(m->stylesheet, rdoc, 0)))
{
yaz_log(YLOG_WARN, "XSLT transformation failed");
// 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, const char *name)
+char *session_setting_oneval(struct session *s, struct database *db, int offset)
{
- int offset = settings_offset(name);
-
- if (offset < 0)
- return 0;
if (!db->settings[offset])
return 0;
return db->settings[offset]->value;
http_init(hp);
}
-// Initialize CCL map for a target
-// Note: This approach ignores user-specific CCL maps, for which I
-// don't presently see any application.
-static void prepare_cclmap(void *context, struct database *db)
-{
- struct setting *s;
-
- if (!db->settings)
- return;
- db->ccl_map = ccl_qual_mk();
- for (s = db->settings[PZ_CCLMAP]; s; s = s->next)
- if (!*s->user)
- {
- char *p = strchr(s->name + 3, ':');
- if (!p)
- {
- yaz_log(YLOG_FATAL, "Malformed cclmap name: %s", s->name);
- exit(1);
- }
- p++;
- ccl_qual_fitem(db->ccl_map, s->value, p);
- }
-}
-
-// Read settings for each database, and prepare a CCL map for that database
-static void prepare_cclmaps(void)
-{
- grep_databases(0, 0, prepare_cclmap);
-}
-
static void start_proxy(void)
{
char hp[128] = "";
else if (global_parameters.server->settings)
settings_read(global_parameters.server->settings);
else
- yaz_log(YLOG_WARN, "No settings-directory specified. Problems may ensue!");
- prepare_cclmaps();
- global_parameters.yaz_marc = yaz_marc_create();
- yaz_marc_subfield_str(global_parameters.yaz_marc, "\t");
+ yaz_log(YLOG_WARN, "No settings-directory specified. Problems may well ensue!");
+ prepare_databases();
global_parameters.odr_in = odr_createmem(ODR_DECODE);
global_parameters.odr_out = odr_createmem(ODR_ENCODE);
projects / pazpar2-moved-to-github.git / blobdiff