X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fdatabase.c;h=08359d600808b9c4353d740763bd10b73cfdb512;hb=9781a15c4874c98656c0ae8d3be9cacc75e19649;hp=5648af80890651d77499dc9bb2f2101334e754c7;hpb=06f4982922e351c51a267025816d02db8a5f94e0;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 5648af8..08359d6 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + 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 @@ -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;