X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=d7c335655e12757225fa38876254040d370ce76a;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=2b40874a94f3e2a365164eec850c8550dd66d689;hpb=5d5cf2f51fc899f72dbb4b0cd869094fdb0469c8;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 2b40874..d7c3356 100644 --- a/src/database.c +++ b/src/database.c @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "settings.h" #include "http.h" #include "zeerex.h" +#include "database.h" #include #if HAVE_SYS_SOCKET_H @@ -44,27 +45,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -static struct host *hosts = 0; // The hosts we know about -static struct database *databases = 0; // The databases we know about -static NMEM nmem = 0; +static struct host *hosts = 0; /* thread pr */ -static xmlDoc *get_explain_xml(const char *id) +static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles, + const char *id) { struct stat st; char *dir; char path[256]; char ide[256]; - if (!config || !config->targetprofiles) - { - yaz_log(YLOG_WARN, "Config must be loaded and specify targetprofiles"); - return 0; - } - if (config->targetprofiles->type != Targetprofiles_local) + if (targetprofiles->type != Targetprofiles_local) { yaz_log(YLOG_FATAL, "Only supports local type"); return 0; } - dir = config->targetprofiles->src; + dir = targetprofiles->src; urlencode(id, ide); sprintf(path, "%s/%s", dir, ide); if (!stat(path, &st)) @@ -103,7 +98,8 @@ static struct host *find_host(const char *hostport) return create_host(hostport); } -static struct database *load_database(const char *id) +static struct database *load_database(const char *id, + struct conf_service *service) { xmlDoc *doc = 0; struct zr_explain *explain = 0; @@ -114,13 +110,11 @@ static struct database *load_database(const char *id) struct setting *idset; yaz_log(YLOG_LOG, "New database: %s", id); - if (!nmem) - nmem = nmem_create(); - if (config && config->targetprofiles - && (doc = get_explain_xml(id))) + if (service->targetprofiles + && (doc = get_explain_xml(service->targetprofiles, id))) { - explain = zr_read_xml(nmem, xmlDocGetRootElement(doc)); + explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc)); if (!explain) return 0; } @@ -134,45 +128,47 @@ static struct database *load_database(const char *id) dbname = ""; if (!(host = find_host(hostport))) return 0; - db = nmem_malloc(nmem, sizeof(*db)); + db = nmem_malloc(service->nmem, sizeof(*db)); memset(db, 0, sizeof(*db)); db->host = host; - db->url = nmem_strdup(nmem, id); + db->url = nmem_strdup(service->nmem, id); db->databases = xmalloc(2 * sizeof(char *)); - db->databases[0] = nmem_strdup(nmem, dbname); + db->databases[0] = nmem_strdup(service->nmem, dbname); db->databases[1] = 0; db->errors = 0; db->explain = explain; db->settings = 0; - db->settings = nmem_malloc(nmem, sizeof(struct settings*) * settings_num()); - memset(db->settings, 0, sizeof(struct settings*) * settings_num()); - idset = nmem_malloc(nmem, sizeof(*idset)); + db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) * + settings_num(service)); + memset(db->settings, 0, sizeof(struct settings*) * settings_num(service)); + idset = nmem_malloc(service->nmem, sizeof(*idset)); idset->precedence = 0; idset->name = "pz:id"; idset->target = idset->value = db->url; idset->next = 0; db->settings[PZ_ID] = idset; - db->next = databases; - databases = db; + db->next = service->databases; + service->databases = db; return db; } // Return a database structure by ID. Load and add to list if necessary // new==1 just means we know it's not in the list -struct database *find_database(const char *id, int new) +struct database *find_database(const char *id, int new, + struct conf_service *service) { struct database *p; if (!new) { - for (p = databases; p; p = p->next) + for (p = service->databases; p; p = p->next) if (!strcmp(p->url, id)) return p; } - return load_database(id); + return load_database(id, service); } // This whole session_grep database thing should be moved elsewhere @@ -207,9 +203,11 @@ int match_zurl(const char *zurl, const char *pattern) } // This will be generalized at some point -static int match_criterion(struct setting **settings, struct database_criterion *c) +static int match_criterion(struct setting **settings, + struct conf_service *service, + struct database_criterion *c) { - int offset = settings_offset(c->name); + int offset = settings_offset(service, c->name); struct database_criterion_value *v; if (offset < 0) @@ -238,10 +236,12 @@ static int match_criterion(struct setting **settings, struct database_criterion return 0; } -int database_match_criteria(struct setting **settings, struct database_criterion *cl) +int database_match_criteria(struct setting **settings, + struct conf_service *service, + struct database_criterion *cl) { for (; cl; cl = cl->next) - if (!match_criterion(settings, cl)) + if (!match_criterion(settings, service, cl)) break; if (cl) // one of the criteria failed to match -- skip this db return 0; @@ -263,7 +263,7 @@ int session_grep_databases(struct session *se, struct database_criterion *cl, continue; if (!p->settings[PZ_NAME]) continue; - if (database_match_criteria(p->settings, cl)) + if (database_match_criteria(p->settings, se->service, cl)) { (*fun)(se, p); i++; @@ -272,14 +272,15 @@ int session_grep_databases(struct session *se, struct database_criterion *cl, return i; } -int predef_grep_databases(void *context, struct database_criterion *cl, +int predef_grep_databases(void *context, struct conf_service *service, + struct database_criterion *cl, void (*fun)(void *context, struct database *db)) { struct database *p; int i = 0; - for (p = databases; p; p = p->next) - if (database_match_criteria(p->settings, cl)) + for (p = service->databases; p; p = p->next) + if (database_match_criteria(p->settings, service, cl)) { (*fun)(context, p); i++;