From 9781a15c4874c98656c0ae8d3be9cacc75e19649 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 18 May 2011 12:39:46 +0200 Subject: [PATCH] Remove unmaintained zeerex/explain code --- src/Makefile.am | 2 +- src/database.c | 30 --- src/pazpar2_config.c | 52 ---- src/pazpar2_config.h | 9 - src/zeerex.c | 709 -------------------------------------------------- src/zeerex.h | 236 ----------------- win/makefile | 1 - 7 files changed, 1 insertion(+), 1038 deletions(-) delete mode 100644 src/zeerex.c delete mode 100644 src/zeerex.h diff --git a/src/Makefile.am b/src/Makefile.am index bc9be7b..1b18290 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ libpazpar2_a_SOURCES = pazpar2_config.c pazpar2_config.h eventl.c eventl.h \ record.h record.c reclists.c reclists.h \ relevance.c relevance.h termlists.c termlists.h \ normalize7bit.h normalize7bit.c \ - zeerex.c zeerex.h database.c database.h \ + database.c database.h \ settings.h settings.c sel_thread.c sel_thread.h getaddrinfo.c \ charsets.c charsets.h \ client.c client.h connection.c connection.h host.h parameters.h \ diff --git a/src/database.c b/src/database.c index 5a312f5..08359d6 100644 --- a/src/database.c +++ b/src/database.c @@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "pazpar2_config.h" #include "settings.h" #include "http.h" -#include "zeerex.h" #include "database.h" #include @@ -72,27 +71,6 @@ struct database_hosts { YAZ_MUTEX mutex; }; -static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles, - const char *id) -{ - struct stat st; - char *dir; - char path[256]; - char ide[256]; - if (targetprofiles->type != Targetprofiles_local) - { - yaz_log(YLOG_FATAL, "Only supports local type"); - return 0; - } - dir = targetprofiles->src; - urlencode(id, ide); - sprintf(path, "%s/%s", dir, ide); - if (!stat(path, &st)) - return xmlParseFile(path); - else - return 0; -} - // Create a new host structure for hostport static struct host *create_host(const char *hostport, iochan_man_t iochan_man) { @@ -211,15 +189,7 @@ static struct database *load_database(const char *id, { struct database *db; struct zr_explain *explain = 0; - xmlDoc *doc = 0; - if (service->targetprofiles - && (doc = get_explain_xml(service->targetprofiles, id))) - { - explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc)); - if (!explain) - return 0; - } db = new_database(id, service->nmem); db->explain = explain; db->next = service->databases; diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 8b94b63..ccd7be4 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -60,9 +60,6 @@ struct conf_config static char *parse_settings(struct conf_config *config, NMEM nmem, xmlNode *node); -static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, - xmlNode *node); - static void conf_metadata_assign(NMEM nmem, struct conf_metadata * metadata, const char *name, @@ -122,7 +119,6 @@ static struct conf_service *service_init(struct conf_server *server, service->next = 0; service->settings = 0; service->databases = 0; - service->targetprofiles = 0; service->server = server; service->session_timeout = 60; /* default session timeout */ service->z3950_session_timeout = 180; @@ -515,17 +511,6 @@ static struct conf_service *service_create_static(struct conf_server *server, } else if (!strcmp((const char *) n->name, "settings")) got_settings++; - else if (!strcmp((const char *) n->name, (const char *) "targetprofiles")) - { - if (service->targetprofiles) - { - yaz_log(YLOG_FATAL, "Can't repeat targetprofiles"); - return 0; - } - if (!(service->targetprofiles = - parse_targetprofiles(service->nmem, n))) - return 0; - } else if (!strcmp((const char *) n->name, "relevance")) { if (service->relevance_pct) @@ -882,43 +867,6 @@ WRBUF conf_get_fname(struct conf_config *config, const char *fname) return w; } -static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, - xmlNode *node) -{ - struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r)); - xmlChar *type = xmlGetProp(node, (xmlChar *) "type"); - xmlChar *src = xmlGetProp(node, (xmlChar *) "src"); - - memset(r, 0, sizeof(*r)); - - if (type) - { - if (!strcmp((const char *) type, "local")) - r->type = Targetprofiles_local; - else - { - yaz_log(YLOG_FATAL, "Unknown targetprofile type"); - return 0; - } - } - else - { - yaz_log(YLOG_FATAL, "Must specify type for targetprofile"); - return 0; - } - - if (src) - r->src = nmem_strdup(nmem, (const char *) src); - else - { - yaz_log(YLOG_FATAL, "Must specify src in targetprofile"); - return 0; - } - xmlFree(type); - xmlFree(src); - return r; -} - struct conf_service *locate_service(struct conf_server *server, const char *service_id) { diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 60d7793..dd199c5 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -122,7 +122,6 @@ struct conf_service pp2_charset_t facet_pct; struct database *databases; - struct conf_targetprofiles *targetprofiles; struct conf_server *server; }; @@ -153,14 +152,6 @@ struct conf_server database_hosts_t database_hosts; }; -struct conf_targetprofiles -{ - enum { - Targetprofiles_local - } type; - char *src; -}; - struct conf_config *config_create(const char *fname, int verbose); void config_destroy(struct conf_config *config); void config_process_events(struct conf_config *config); diff --git a/src/zeerex.c b/src/zeerex.c deleted file mode 100644 index 3894435..0000000 --- a/src/zeerex.c +++ /dev/null @@ -1,709 +0,0 @@ -/* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data - -Pazpar2 is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -// Reads Zeerex records into a set of structures - -#include - -#include - -#include -#include - -#include "zeerex.h" - -// Replace this with something that will take a callback -static void fail(const char *s, xmlNode *n) -{ - yaz_log(YLOG_WARN, "Zeerex Err '%s'; elem '%s/%s'", - s, n->parent->name, n->name); -} - -// returns an nmem-allocated string if attr is present, or null -static char *attrtostr(NMEM m, xmlNode *n, const char *name) -{ - char *s = (char *) xmlGetProp(n, (xmlChar *) name); - if (s) - { - char *r = nmem_strdup(m, s); - xmlFree(s); - return r; - } - else - return 0; -} - -static int attrtoint(xmlNode *n, const char *name) -{ - char *s = (char *)xmlGetProp(n, (xmlChar *) name); - if (s) - { - int val = atoi(s); - xmlFree(s); - return val; - } - else - return 0; -} - -static Zr_bool attrtobool(xmlNode *node, const char *name) -{ - char *v = (char *) xmlGetProp(node, (xmlChar *) name); - if (v) - { - Zr_bool res; - if (!strcmp(v, "true")) - res = Zr_bool_true; - else if (!strcmp(v, "false")) - res = Zr_bool_false; - else - res = Zr_bool_unknown; - xmlFree(v); - return res; - } - else - return Zr_bool_unknown; -} - -static char *valuetostr(NMEM m, xmlNode *n) -{ - char *val = (char *) xmlNodeGetContent(n); - if (val) - { - char *res = nmem_strdup(m, val); - xmlFree(val); - return res; - } - else - return 0; -} - -static int valuetoint(xmlNode *n) -{ - char *s = (char *) xmlNodeGetContent(n); - if (s) - { - int res = atoi(s); - xmlFree(s); - return res; - } - else - return 0; -} - -static Zr_langstr *findlangstr(NMEM m, xmlNode *node, const char *name) -{ - xmlNode *n; - Zr_langstr *res = 0; - for (n = node->children; n; n = n->next) - { - if (n->type == XML_ELEMENT_NODE - && !strcmp((const char *) n->name, name)) - { - Zr_langstr *new = nmem_malloc(m, sizeof(*new)); - memset(new, 0, sizeof(*new)); - new->primary = attrtobool(n, "primary"); - new->lang = attrtostr(m, n, "lang"); - new->str = valuetostr(m, n); - new->next = res; - res = new; - } - } - return res; -} - -const char *zr_langstr(Zr_langstr *s, const char *lang) -{ - Zr_langstr *p; - for (p = s; p; p = p->next) - if ((!lang && p->primary == Zr_bool_true) || - (lang && p->lang && !strcmp(lang, p->lang))) - return p->str; - return s->str; -} - -static struct zr_authentication *authentication(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_authentication *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->type = attrtostr(m, node, "type"); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "open")) - r->open = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "user")) - r->user = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "group")) - r->group = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "password")) - r->password = valuetostr(m, n); - else - { - fail("Unexpected element", n); - return 0; - } - } - return r; -} - - -static struct zr_serverInfo *serverInfo(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_serverInfo *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - r->protocol = attrtostr(m, node, "protocol"); - r->version = attrtostr(m, node, "version"); - r->transport = attrtostr(m, node, "transport"); - r->method = attrtostr(m, node, "method"); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "host")) - r->host = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "port")) - r->port = valuetoint(n); - else if (!strcmp((const char *) n->name, "database")) - r->database = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "authentication")) - { - if (!(r->authentication = authentication(m, n))) - return 0; - } - else - { - fail("Unexpected element", n); - return 0; - } - } - return r; -} - -static struct zr_agent *agent(NMEM m, xmlNode *node) -{ - struct zr_agent *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->type = attrtostr(m, node, "type"); - r->identifier = attrtostr(m, node, "identifier"); - r->value = valuetostr(m, node); - return r; -} - -static struct zr_implementation *implementation(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_implementation *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->identifier = attrtostr(m, node, "identifier"); - r->version = attrtostr(m, node, "version"); - r->title = findlangstr(m, node, "title"); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "agent")) - { - struct zr_agent *ag = agent(m, node); - if (!ag) - return 0; - ag->next = r->agents; - r->agents = ag; - } - } - return r; -} - -struct zr_databaseInfo *databaseInfo(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_databaseInfo *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - r->title = findlangstr(m, node, "title"); - r->description = findlangstr(m, node, "description"); - r->history = findlangstr(m, node, "history"); - r->extent = findlangstr(m, node, "extent"); - r->restrictions = findlangstr(m, node, "restrictions"); - r->langUsage = findlangstr(m, node, "langUsage"); - - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "agents")) - { - xmlNode *n2; - for (n2 = n->children; n2; n2 = n2->next) - { - if (n2->type != XML_ELEMENT_NODE) - continue; - if (strcmp((const char *) n2->name, "agent")) - continue; - else - { - struct zr_agent *ag = agent(m, n2); - if (!ag) - return 0; - ag->next = r->agents; - r->agents = ag; - } - } - } - else if (!strcmp((const char *) n->name, "implementation")) - { - if (!(r->implementation = implementation(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "links")) - { - xmlNode *n2; - for (n2 = n->children; n2; n2 = n2->next) - { - if (n2->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n2->name, "link")) - continue; - else - { - struct zr_link *li = nmem_malloc(m, sizeof(*li)); - memset(li, 0, sizeof(*li)); - li->type = attrtostr(m, n2, "type"); - li->value = valuetostr(m, n2); - li->next = r->links; - r->links = li; - } - } - } - else if (!strcmp((const char *) n->name, "history") && !r->lastUpdate) - r->lastUpdate = attrtostr(m, n, "lastUpdate"); - else if (!strcmp((const char *) n->name, "extent") && !r->numberOfRecords) - r->numberOfRecords = attrtoint(n, "numberOfRecords"); - else if (!strcmp((const char *) n->name, "langUsage") && !r->codes) - r->codes = attrtostr(m, n, "codes"); - } - return r; -} - -struct zr_metaInfo *metaInfo(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_metaInfo *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "dateModified")) - r->dateModified = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "dateAggregated")) - r->dateAggregated = valuetostr(m, n); - else if (!strcmp((const char *) n->name, "aggregatedFrom")) - r->aggregatedFrom = valuetostr(m, n); - else - { - fail("Unexpected element", n); - return 0; - } - } - return r; -} - -struct zr_set *set(NMEM m, xmlNode *node) -{ - struct zr_set *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->name = attrtostr(m, node, "name"); - r->identifier = attrtostr(m, node, "identifier"); - r->title = findlangstr(m, node, "title"); - return r; -} - -struct zr_attr *attr(NMEM m, xmlNode *node) -{ - struct zr_attr *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->type = attrtoint(node, "type"); - r->set = attrtostr(m, node, "set"); - return r; -} - -static struct zr_map *map(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_map *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - r->lang = attrtostr(m, node, "lang"); - r->primary = attrtobool(node, "primary"); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "name")) - { - r->set = attrtostr(m, n, "set"); - r->name = valuetostr(m, n); - } - else if (!strcmp((const char *) n->name, "attr")) - { - struct zr_attr *new = attr(m, n); - if (!new) - return 0; - new->next = r->attrs; - r->attrs = new; - } - else - { - fail("Unexpected element", n); - return 0; - } - } - return r; -} - -static Zr_setting *findsetting(NMEM m, xmlNode *node, char *name) -{ - static Zr_setting *r = 0; /* thread pr */ - xmlNode *n; - for (n = node->children; n; n = n->next) - { - if (node->type == XML_ELEMENT_NODE && !strcmp((const char *) n->name, name)) - { - xmlNode *n2; - struct zr_setting *new = nmem_malloc(m, sizeof(*new)); - memset(new, 0, sizeof(*new)); - new->type = attrtostr(m, n, "type"); - for (n2 = n->children; n2; n2 = n2->next) - { - if (n2->type == XML_ELEMENT_NODE && !strcmp((const char *) n2->name, "map")) - { - new->map = map(m, n2); - if (!new) - return 0; - break; - } - } - if (!new->map) - new->value = (char *) xmlNodeGetContent(n); - new->next = r; - r = new; - } - } - return r; -} - -static struct zr_configInfo *configInfo(NMEM m, xmlNode *node) -{ - struct zr_configInfo *r = nmem_malloc(m, sizeof(*r)); - - r->defaultv = findsetting(m, node, "default"); - r->setting = findsetting(m, node, "setting"); - r->supports = findsetting(m, node, "supports"); - return r; -} - -static struct zr_index *parse_index(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_index *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - r->search = attrtobool(node, "search"); - r->scan = attrtobool(node, "scan"); - r->sort = attrtobool(node, "sort"); - r->id = attrtostr(m, node, "id"); - r->title = findlangstr(m, node, "title"); - - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "map")) - { - struct zr_map *new = map(m, n); - if (!new) - return 0; - new->next = r->maps; - r->maps = new; - } - else if (!strcmp((const char *) n->name, "configInfo")) - { - if (!(r->configInfo = configInfo(m, n))) - return 0; - } - else if (strcmp((const char *) n->name, "title")) - { - fail("Unknown child element", n); - return 0; - } - } - return r; -} - -static struct zr_sortKeyword *sortKeyword(NMEM m, xmlNode *node) -{ - struct zr_sortKeyword *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->value = valuetostr(m, node); - return r; -} - -static struct zr_indexInfo *indexInfo(NMEM m , xmlNode *node) -{ - xmlNode *n; - struct zr_indexInfo *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "set")) - { - struct zr_set *new = set(m, n); - if (!new) - return 0; - new->next = r->sets; - r->sets = new; - } - else if (!strcmp((const char *) n->name, "index")) - { - struct zr_index *new = parse_index(m, n); - if (!new) - return 0; - new->next = r->indexes; - r->indexes = new; - } - else if (!strcmp((const char *) n->name, "sortKeyword")) - { - struct zr_sortKeyword *new = sortKeyword(m, n); - if (!new) - return 0; - new->next = r->sortKeywords; - r->sortKeywords = new; - } - else if (!strcmp((const char *) n->name, "sortKeyword")) - { - if (!(r->configInfo = configInfo(m, n))) - return 0; - } - else - { - fail("Unknown child element", n); - return 0; - } - } - return r; -} - -static struct zr_elementSet *elementSet(NMEM m, xmlNode *node) -{ - struct zr_elementSet *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - r->name = attrtostr(m, node, "name"); - r->identifier = attrtostr(m, node, "identifier"); - r->title = findlangstr(m, node, "title"); - return r; -} - -static struct zr_recordSyntax *recordSyntax(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_recordSyntax *r = nmem_malloc(m, sizeof(*r)); - struct zr_elementSet **elementp = &r->elementSets; - - memset(r, 0, sizeof(*r)); - r->name = attrtostr(m, node, "name"); - r->identifier = attrtostr(m, node, "identifier"); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "elementSet")) - { - if (!(*elementp = elementSet(m, n))) - return 0; - elementp = &(*elementp)->next; - } - else - { - fail("Unknown child element", n); - return 0; - } - } - return r; -} - -static struct zr_recordInfo *recordInfo(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_recordInfo *r = nmem_malloc(m, sizeof(*r)); - struct zr_recordSyntax **syntaxp = &r->recordSyntaxes; - - memset(r, 0, sizeof(*r)); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "recordSyntax")) - { - if (!(*syntaxp = recordSyntax(m, n))) - return 0; - syntaxp = &(*syntaxp)->next; - } - else - { - fail("Unknown child element", n); - return 0; - } - } - return r; -} - - -static struct zr_schema *schema(NMEM m, xmlNode *node) -{ - struct zr_schema *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - r->name = attrtostr(m, node, "name"); - r->identifier = attrtostr(m, node, "identifier"); - r->retrieve = attrtobool(node, "retrieve"); - r->sort = attrtobool(node, "sort"); - r->location = attrtostr(m, node, "location"); - r->title = findlangstr(m, node, "title"); - return r; -} - -static struct zr_schemaInfo *schemaInfo(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_schemaInfo *r = nmem_malloc(m, sizeof(*r)); - struct zr_schema **schemap = &r->schemas; - - memset(r, 0, sizeof(*r)); - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "schema")) - { - if (!(*schemap = schema(m, n))) - return 0; - schemap = &(*schemap)->next; - } - else - { - fail("Unknown child element", n); - return 0; - } - } - return r; -} - -static struct zr_explain *explain(NMEM m, xmlNode *node) -{ - xmlNode *n; - struct zr_explain *r = nmem_malloc(m, sizeof(*r)); - memset(r, 0, sizeof(*r)); - - for (n = node->children; n; n = n->next) - { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "serverInfo")) - { - if (!(r->serverInfo = serverInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "databaseInfo")) - { - if (!(r->databaseInfo = databaseInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "metaInfo")) - { - if (!(r->metaInfo = metaInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "indexInfo")) - { - if (!(r->indexInfo = indexInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "recordInfo")) - { - if (!(r->recordInfo = recordInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "schemaInfo")) - { - if (!(r->schemaInfo = schemaInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "configInfo")) - { - if (!(r->configInfo = configInfo(m, n))) - return 0; - } - else if (!strcmp((const char *) n->name, "status")) - continue; - else - { - fail("Unknown child element of root node", n); - return 0; - } - } - return r; -} - -struct zr_explain *zr_read_xml(NMEM m, xmlNode *n) -{ - return explain(m, n); -} - -struct zr_explain *zr_read_file(NMEM m, const char *fn) -{ - xmlDoc *doc = xmlParseFile(fn); - struct zr_explain *r; - if (!doc) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "Unable to open %s", fn); - return 0; - } - r = explain(m, xmlDocGetRootElement(doc)); - xmlFree(doc); - return r; -} - -/* - * Local variables: - * c-basic-offset: 4 - * c-file-style: "Stroustrup" - * indent-tabs-mode: nil - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ - diff --git a/src/zeerex.h b/src/zeerex.h deleted file mode 100644 index 20ad4ec..0000000 --- a/src/zeerex.h +++ /dev/null @@ -1,236 +0,0 @@ -/* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data - -Pazpar2 is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#ifndef ZEEREX_H -#define ZEEREX_H - -// Structures representing a Zeerex record. - -typedef enum zr_bool -{ - Zr_bool_unknown, - Zr_bool_false, - Zr_bool_true -} Zr_bool; - -typedef struct zr_langstr -{ - Zr_bool primary; - char *lang; - char *str; - struct zr_langstr *next; -} Zr_langstr; - -struct zr_authentication -{ - char *type; - char *open; - char *user; - char *group; - char *password; -}; - -struct zr_serverInfo -{ - char *protocol; - char *version; - char *transport; - char *method; - char *host; - int port; - char *database; - struct zr_authentication *authentication; -}; - -struct zr_agent -{ - char *type; - char *identifier; - char *value; - struct zr_agent *next; -}; - -struct zr_link -{ - char *type; - char *value; - struct zr_link *next; -}; - -struct zr_implementation -{ - char *identifier; - char *version; - struct zr_agent *agents; - Zr_langstr *title; -}; - -struct zr_databaseInfo -{ - Zr_langstr *title; - Zr_langstr *description; - Zr_langstr *history; - char *lastUpdate; - Zr_langstr *extent; - int numberOfRecords; - Zr_langstr *restrictions; - Zr_langstr *langUsage; - char *codes; - struct zr_agent *agents; - struct zr_implementation *implementation; - struct zr_link *links; -}; - -struct zr_metaInfo -{ - char *dateModified; - char *dateAggregated; - char *aggregatedFrom; -}; - -struct zr_set -{ - Zr_langstr *title; - char *name; - char *identifier; - struct zr_set *next; -}; - -struct zr_attr -{ - int type; - char *set; - char *value; - struct zr_attr *next; -}; - -struct zr_map -{ - Zr_bool primary; - char *lang; - char *name; - char *set; - struct zr_attr *attrs; - struct zr_map *next; -}; - -typedef struct zr_setting -{ - char *type; - char *value; - struct zr_map *map; - struct zr_setting *next; -} Zr_setting; - -struct zr_configInfo -{ - Zr_setting *defaultv; - Zr_setting *setting; - Zr_setting *supports; -}; - -struct zr_index -{ - Zr_bool search; - Zr_bool scan; - Zr_bool sort; - char *id; - Zr_langstr *title; - struct zr_map *maps; - struct zr_configInfo *configInfo; - struct zr_index *next; -}; - -struct zr_sortKeyword -{ - char *value; - struct zr_sortKeyword *next; -}; - -struct zr_indexInfo -{ - struct zr_set *sets; - struct zr_index *indexes; - struct zr_sortKeyword *sortKeywords; - struct zr_configInfo *configInfo; -}; - -struct zr_elementSet -{ - char *name; - char *identifier; - Zr_langstr *title; - struct zr_elementSet *next; -}; - -struct zr_recordSyntax -{ - char *name; - char *identifier; - struct zr_elementSet *elementSets; - struct zr_recordSyntax *next; -}; - -struct zr_recordInfo -{ - struct zr_recordSyntax *recordSyntaxes; -}; - -struct zr_schema -{ - char *name; - char *identifier; - Zr_bool retrieve; - Zr_bool sort; - char *location; - Zr_langstr *title; - struct zr_schema *next; -}; - -struct zr_schemaInfo -{ - struct zr_schema *schemas; -}; - -struct zr_explain -{ - struct zr_serverInfo *serverInfo; - struct zr_databaseInfo *databaseInfo; - struct zr_metaInfo *metaInfo; - struct zr_indexInfo *indexInfo; - struct zr_recordInfo *recordInfo; - struct zr_schemaInfo *schemaInfo; - struct zr_configInfo *configInfo; -}; - -struct zr_explain *zr_read_xml(NMEM m, xmlNode *n); -struct zr_explain *zr_read_file(NMEM m, const char *fn); -const char *zr_langstr(Zr_langstr *s, const char *lang); - -#endif - -/* - * Local variables: - * c-basic-offset: 4 - * c-file-style: "Stroustrup" - * indent-tabs-mode: nil - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ - diff --git a/win/makefile b/win/makefile index 4748a0a..fd49e92 100644 --- a/win/makefile +++ b/win/makefile @@ -189,7 +189,6 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\relevance.obj" \ "$(OBJDIR)\termlists.obj" \ "$(OBJDIR)\normalize7bit.obj" \ - "$(OBJDIR)\zeerex.obj" \ "$(OBJDIR)\database.obj" \ "$(OBJDIR)\settings.obj" \ "$(OBJDIR)\getaddrinfo.obj" \ -- 1.7.10.4