X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.h;h=1e00cc69bbdafcf0c4e49907c5623a1c62b1d1d1;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=1394732be1d3ca298aa045b402354cf86761e8d6;hpb=b13c46b73ad2b8e85340396cfcb0b46421db1d15;p=pazpar2-moved-to-github.git diff --git a/src/database.h b/src/database.h index 1394732..1e00cc6 100644 --- a/src/database.h +++ b/src/database.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data + Copyright (C) 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 @@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef DATABASE_H #define DATABASE_H -typedef struct database_hosts *database_hosts_t; struct session_database; struct session; struct conf_service; +struct settings_array; + struct database *create_database_for_service(const char *id, struct conf_service *service); int session_grep_databases(struct session *se, const char *filter, @@ -32,10 +33,8 @@ int predef_grep_databases(void *context, struct conf_service *service, void (*fun)(void *context, struct database *db)); int match_zurl(const char *zurl, const char *pattern); struct database *new_database(const char *id, NMEM nmem); +// inherit values from (service) settings +struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *settings); -database_hosts_t database_hosts_create(void); -void database_hosts_destroy(database_hosts_t *); - -struct host *find_host(database_hosts_t hosts, const char *hostport); #endif