-/* $Id: config.c,v 1.17 2007-03-20 07:27:51 adam Exp $ */
+/* $Id: config.c,v 1.18 2007-03-27 11:25:57 marc Exp $ */
#include <string.h>
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, (const char *) "metadata"))
+ if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
struct conf_metadata *md = &r->metadata[md_node];
- xmlChar *name = xmlGetProp(n, "name");
- xmlChar *brief = xmlGetProp(n, "brief");
- xmlChar *sortkey = xmlGetProp(n, "sortkey");
- xmlChar *merge = xmlGetProp(n, "merge");
- xmlChar *type = xmlGetProp(n, "type");
- xmlChar *termlist = xmlGetProp(n, "termlist");
- xmlChar *rank = xmlGetProp(n, "rank");
+ xmlChar *name = xmlGetProp(n, (xmlChar *) "name");
+ xmlChar *brief = xmlGetProp(n, (xmlChar *) "brief");
+ xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
+ xmlChar *merge = xmlGetProp(n, (xmlChar *) "merge");
+ xmlChar *type = xmlGetProp(n, (xmlChar *) "type");
+ xmlChar *termlist = xmlGetProp(n, (xmlChar *) "termlist");
+ xmlChar *rank = xmlGetProp(n, (xmlChar *) "rank");
if (!name)
{
yaz_log(YLOG_FATAL, "Must specify name in metadata element");
return 0;
}
- md->name = nmem_strdup(nmem, name);
+ md->name = nmem_strdup(nmem, (const char *) name);
if (brief)
{
- if (!strcmp(brief, "yes"))
+ if (!strcmp((const char *) brief, "yes"))
md->brief = 1;
- else if (strcmp(brief, "no"))
+ else if (strcmp((const char *) brief, "no"))
{
yaz_log(YLOG_FATAL, "metadata/brief must be yes or no");
return 0;
if (termlist)
{
- if (!strcmp(termlist, "yes"))
+ if (!strcmp((const char *) termlist, "yes"))
md->termlist = 1;
- else if (strcmp(termlist, "no"))
+ else if (strcmp((const char *) termlist, "no"))
{
yaz_log(YLOG_FATAL, "metadata/termlist must be yes or no");
return 0;
md->termlist = 0;
if (rank)
- md->rank = atoi(rank);
+ md->rank = atoi((const char *) rank);
else
md->rank = 0;
if (type)
{
- if (!strcmp(type, "generic"))
+ if (!strcmp((const char *) type, "generic"))
md->type = Metadata_type_generic;
- else if (!strcmp(type, "year"))
+ else if (!strcmp((const char *) type, "year"))
md->type = Metadata_type_year;
else
{
if (merge)
{
- if (!strcmp(merge, "no"))
+ if (!strcmp((const char *) merge, "no"))
md->merge = Metadata_merge_no;
- else if (!strcmp(merge, "unique"))
+ else if (!strcmp((const char *) merge, "unique"))
md->merge = Metadata_merge_unique;
- else if (!strcmp(merge, "longest"))
+ else if (!strcmp((const char *) merge, "longest"))
md->merge = Metadata_merge_longest;
- else if (!strcmp(merge, "range"))
+ else if (!strcmp((const char *) merge, "range"))
md->merge = Metadata_merge_range;
- else if (!strcmp(merge, "all"))
+ else if (!strcmp((const char *) merge, "all"))
md->merge = Metadata_merge_all;
else
{
else
md->merge = Metadata_merge_no;
- if (sortkey && strcmp(sortkey, "no"))
+ if (sortkey && strcmp((const char *) sortkey, "no"))
{
struct conf_sortkey *sk = &r->sortkeys[sk_node];
if (md->merge == Metadata_merge_no)
yaz_log(YLOG_FATAL, "Can't specify sortkey on a non-merged field");
return 0;
}
- if (!strcmp(sortkey, "numeric"))
+ if (!strcmp((const char *) sortkey, "numeric"))
sk->type = Metadata_sortkey_numeric;
- else if (!strcmp(sortkey, "skiparticle"))
+ else if (!strcmp((const char *) sortkey, "skiparticle"))
sk->type = Metadata_sortkey_skiparticle;
else
{
r->proxy_host = 0;
r->proxy_port = 0;
r->myurl = 0;
+ r->zproxy_host = 0;
+ r->zproxy_port = 0;
r->service = 0;
r->next = 0;
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, "listen"))
+ if (!strcmp((const char *) n->name, "listen"))
{
- xmlChar *port = xmlGetProp(n, "port");
- xmlChar *host = xmlGetProp(n, "host");
+ xmlChar *port = xmlGetProp(n, (xmlChar *) "port");
+ xmlChar *host = xmlGetProp(n, (xmlChar *) "host");
if (port)
- r->port = atoi(port);
+ r->port = atoi((const char *) port);
if (host)
- r->host = nmem_strdup(nmem, host);
+ r->host = nmem_strdup(nmem, (const char *) host);
xmlFree(port);
xmlFree(host);
}
- else if (!strcmp(n->name, "proxy"))
+ else if (!strcmp((const char *) n->name, "proxy"))
{
- xmlChar *port = xmlGetProp(n, "port");
- xmlChar *host = xmlGetProp(n, "host");
- xmlChar *myurl = xmlGetProp(n, "myurl");
+ xmlChar *port = xmlGetProp(n, (xmlChar *) "port");
+ xmlChar *host = xmlGetProp(n, (xmlChar *) "host");
+ xmlChar *myurl = xmlGetProp(n, (xmlChar *) "myurl");
if (port)
- r->proxy_port = atoi(port);
+ r->proxy_port = atoi((const char *) port);
if (host)
- r->proxy_host = nmem_strdup(nmem, host);
+ r->proxy_host = nmem_strdup(nmem, (const char *) host);
if (myurl)
- r->myurl = nmem_strdup(nmem, myurl);
+ r->myurl = nmem_strdup(nmem, (const char *) myurl);
else
{
yaz_log(YLOG_FATAL, "Must specify @myurl for proxy");
xmlFree(host);
xmlFree(myurl);
}
- else if (!strcmp(n->name, "service"))
+ else if (!strcmp((const char *) n->name, "zproxy"))
+ {
+ xmlChar *port = 0;
+ xmlChar *host = 0;
+
+ port = xmlGetProp(n, (xmlChar *) "port");
+ host = xmlGetProp(n, (xmlChar *) "host");
+
+ if (port)
+ r->zproxy_port = atoi((const char *) port);
+ if (host)
+ r->zproxy_host = nmem_strdup(nmem, (const char *) host);
+
+ xmlFree(port);
+ xmlFree(host);
+ }
+ else if (!strcmp((const char *) n->name, "service"))
{
struct conf_service *s = parse_service(n);
if (!s)
{
char path[256];
sprintf(path, "%s/%s", confdir, fname);
- return xsltParseStylesheetFile(path);
+ return xsltParseStylesheetFile((xmlChar *) path);
}
static void setup_marc(struct conf_retrievalprofile *r)
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, "requestsyntax"))
+ if (!strcmp((const char *) n->name, "requestsyntax"))
{
xmlChar *content = xmlNodeGetContent(n);
if (content)
- r->requestsyntax = nmem_strdup(nmem, content);
+ r->requestsyntax = nmem_strdup(nmem, (const char *) content);
}
- else if (!strcmp(n->name, "nativesyntax"))
+ else if (!strcmp((const char *) n->name, "nativesyntax"))
{
- xmlChar *name = xmlGetProp(n, "name");
- xmlChar *format = xmlGetProp(n, "format");
- xmlChar *encoding = xmlGetProp(n, "encoding");
- xmlChar *mapto = xmlGetProp(n, "mapto");
+ xmlChar *name = xmlGetProp(n, (xmlChar *) "name");
+ xmlChar *format = xmlGetProp(n, (xmlChar *) "format");
+ xmlChar *encoding = xmlGetProp(n, (xmlChar *) "encoding");
+ xmlChar *mapto = xmlGetProp(n, (xmlChar *) "mapto");
if (!name)
{
yaz_log(YLOG_WARN, "Missing name in 'nativesyntax' element");
return 0;
}
if (encoding)
- r->native_encoding = encoding;
- if (!strcmp(name, "iso2709"))
+ r->native_encoding = (char *) encoding;
+ if (!strcmp((const char *) name, "iso2709"))
{
r->native_syntax = Nativesyn_iso2709;
// Set a few defaults, too
r->native_encoding = "marc-8";
setup_marc(r);
}
- else if (!strcmp(name, "xml"))
+ else if (!strcmp((const char *) name, "xml"))
r->native_syntax = Nativesyn_xml;
else
{
}
if (format)
{
- if (!strcmp(format, "marc21") || !strcmp(format, "usmarc"))
+ if (!strcmp((const char *) format, "marc21")
+ || !strcmp((const char *) format, "usmarc"))
r->native_format = Nativeform_marc21;
else
{
}
if (mapto)
{
- if (!strcmp(mapto, "marcxml"))
+ if (!strcmp((const char *) mapto, "marcxml"))
r->native_mapto = Nativemapto_marcxml;
- else if (!strcmp(mapto, "marcxchange"))
+ else if (!strcmp((const char *)mapto, "marcxchange"))
r->native_mapto = Nativemapto_marcxchange;
else
{
xmlFree(encoding);
xmlFree(mapto);
}
- else if (!strcmp(n->name, "map"))
+ else if (!strcmp((const char *) n->name, "map"))
{
struct conf_retrievalmap *m = nmem_malloc(nmem, sizeof(struct conf_retrievalmap));
- xmlChar *type = xmlGetProp(n, "type");
- xmlChar *charset = xmlGetProp(n, "charset");
- xmlChar *format = xmlGetProp(n, "format");
- xmlChar *stylesheet = xmlGetProp(n, "stylesheet");
+ xmlChar *type = xmlGetProp(n, (xmlChar *) "type");
+ xmlChar *charset = xmlGetProp(n, (xmlChar *) "charset");
+ xmlChar *format = xmlGetProp(n, (xmlChar *) "format");
+ xmlChar *stylesheet = xmlGetProp(n, (xmlChar *) "stylesheet");
memset(m, 0, sizeof(*m));
if (type)
{
- if (!strcmp(type, "xslt"))
+ if (!strcmp((const char *) type, "xslt"))
m->type = Map_xslt;
else
{
}
}
if (charset)
- m->charset = nmem_strdup(nmem, charset);
+ m->charset = nmem_strdup(nmem, (const char *) charset);
if (format)
- m->format = nmem_strdup(nmem, format);
+ m->format = nmem_strdup(nmem, (const char *) format);
if (stylesheet)
{
- if (!(m->stylesheet = load_stylesheet(stylesheet)))
+ if (!(m->stylesheet = load_stylesheet((char *) stylesheet)))
return 0;
}
*rm = m;
static struct conf_targetprofiles *parse_targetprofiles(xmlNode *node)
{
struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r));
- xmlChar *type = xmlGetProp(node, "type");
- xmlChar *src = xmlGetProp(node, "src");
+ xmlChar *type = xmlGetProp(node, (xmlChar *) "type");
+ xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
memset(r, 0, sizeof(*r));
if (type)
{
- if (!strcmp(type, "local"))
+ if (!strcmp((const char *) type, "local"))
r->type = Targetprofiles_local;
else
{
}
if (src)
- r->src = nmem_strdup(nmem, src);
+ r->src = nmem_strdup(nmem, (const char *) src);
else
{
yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, "server"))
+ if (!strcmp((const char *) n->name, "server"))
{
struct conf_server *tmp = parse_server(n);
if (!tmp)
tmp->next = r->servers;
r->servers = tmp;
}
- else if (!strcmp(n->name, "queryprofile"))
+ else if (!strcmp((const char *) n->name, "queryprofile"))
{
}
- else if (!strcmp(n->name, "retrievalprofile"))
+ else if (!strcmp((const char *) n->name, "retrievalprofile"))
{
if (!(*rp = parse_retrievalprofile(n)))
return 0;
rp = &(*rp)->next;
}
- else if (!strcmp(n->name, "targetprofiles"))
+ else if (!strcmp((const char *) n->name, "targetprofiles"))
{
// It would be fun to be able to fix this sometime
if (r->targetprofiles)
-/* $Id: pazpar2.c,v 1.53 2007-03-26 14:00:21 marc Exp $ */
+/* $Id: pazpar2.c,v 1.54 2007-03-27 11:25:57 marc Exp $ */
#include <stdlib.h>
#include <stdio.h>
#include <yaz/proto.h>
#include <yaz/readconf.h>
#include <yaz/pquery.h>
+#include <yaz/otherinfo.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
yaz_log(YLOG_WARN, "Failed to encode as XML");
return 0;
}
- rdoc = xmlNewDoc("1.0");
+ rdoc = xmlNewDoc((xmlChar *) "1.0");
xmlDocSetRootElement(rdoc, res);
}
else
return 0;
root = xmlDocGetRootElement(xdoc);
- if (!(mergekey = xmlGetProp(root, "mergekey")))
+ if (!(mergekey = xmlGetProp(root, (xmlChar *) "mergekey")))
{
yaz_log(YLOG_WARN, "No mergekey found in record");
xmlFreeDoc(xdoc);
sizeof(struct record_metadata*) * service->num_metadata);
memset(res->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
- mergekey_norm = nmem_strdup(se->nmem, (char*) mergekey);
+ mergekey_norm = (xmlChar *) nmem_strdup(se->nmem, (char*) mergekey);
xmlFree(mergekey);
- normalize_mergekey(mergekey_norm, 0);
+ normalize_mergekey((char *) mergekey_norm, 0);
- cluster = reclist_insert(se->reclist, res, mergekey_norm, &se->total_merged);
+ cluster = reclist_insert(se->reclist, res, (char *) mergekey_norm,
+ &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);
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, "metadata"))
+ if (!strcmp((const char *) n->name, "metadata"))
{
struct conf_metadata *md = 0;
struct conf_sortkey *sk = 0;
int imeta;
int first, last;
- type = xmlGetProp(n, "type");
+ type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 0);
if (!type || !value)
// First, find out what field we're looking at
for (imeta = 0; imeta < service->num_metadata; imeta++)
- if (!strcmp(type, service->metadata[imeta].name))
+ if (!strcmp((const char *) type, service->metadata[imeta].name))
{
md = &service->metadata[imeta];
if (md->sortkey_offset >= 0)
if (md->type == Metadata_type_generic)
{
char *p, *pe;
- for (p = value; *p && isspace(*p); p++)
+ for (p = (char *) value; *p && isspace(*p); p++)
;
for (pe = p + strlen(p) - 1;
pe > p && strchr(" ,/.:([", *pe); pe--)
}
else if (md->type == Metadata_type_year)
{
- if (extract_years(value, &first, &last) < 0)
+ if (extract_years((char *) value, &first, &last) < 0)
continue;
}
else
{
struct record_metadata *mnode;
for (mnode = *wheretoput; mnode; mnode = mnode->next)
- if (!strcmp(mnode->data.text, newm->data.text))
+ if (!strcmp((const char *) mnode->data.text, newm->data.text))
break;
if (!mnode)
{
yaz_log(YLOG_WARN, "Don't know how to merge on element name %s", md->name);
if (md->rank)
- relevance_countwords(se->relevance, cluster, value, md->rank);
+ relevance_countwords(se->relevance, cluster,
+ (char *) value, md->rank);
if (md->termlist)
{
if (md->type == Metadata_type_year)
{
char year[64];
sprintf(year, "%d", last);
- add_facet(se, type, year);
+ add_facet(se, (char *) type, year);
if (first != last)
{
sprintf(year, "%d", first);
- add_facet(se, type, year);
+ add_facet(se, (char *) type, year);
}
}
else
- add_facet(se, type, value);
+ add_facet(se, (char *) type, (char *) value);
}
xmlFree(type);
xmlFree(value);
yaz_log(YLOG_LOG, "Target: %s, '%s'", url, db);
for (host = hosts; host; host = host->next)
- if (!strcmp(url, host->hostport))
+ if (!strcmp((const char *) url, host->hostport))
break;
if (!host)
{
int i;
for (i = 0; i < s->num_termlists; i++)
- if (!strcmp(s->termlists[i].name, name))
+ if (!strcmp((const char *) s->termlists[i].name, name))
return termlist_highscore(s->termlists[i].termlist, num);
return 0;
}
http_set_proxyaddr(hp, ser->myurl ? ser->myurl : "");
}
+static void start_zproxy(void)
+{
+ struct conf_server *ser = global_parameters.server;
+
+ if (*global_parameters.zproxy_override){
+ yaz_log(YLOG_LOG, "Z39.50 proxy %s",
+ global_parameters.zproxy_override);
+ return;
+ }
+
+ else if (ser->zproxy_host || ser->zproxy_port)
+ {
+ char hp[128] = "";
+
+ strcpy(hp, ser->zproxy_host ? ser->zproxy_host : "");
+ if (ser->zproxy_port)
+ {
+ if (*hp)
+ strcat(hp, ":");
+ else
+ strcat(hp, "@:");
+
+ sprintf(hp + strlen(hp), "%d", ser->zproxy_port);
+ }
+ strcpy(global_parameters.zproxy_override, hp);
+ yaz_log(YLOG_LOG, "Z39.50 proxy %s",
+ global_parameters.zproxy_override);
+
+ }
+ else
+ return;
+}
+
+
+
int main(int argc, char **argv)
{
int ret;
start_http_listener();
start_proxy();
+ start_zproxy();
+
if (!global_parameters.ccl_filter)
global_parameters.ccl_filter = load_cclfile("../etc/default.bib");
global_parameters.yaz_marc = yaz_marc_create();