X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.h;h=1e00cc69bbdafcf0c4e49907c5623a1c62b1d1d1;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=cf12e9dca1f4d1b20dd3ba13919ba13ec08355b4;hpb=7c65462a944e8f9fbcfa2d310e37dc1a408888e1;p=pazpar2-moved-to-github.git

diff --git a/src/database.h b/src/database.h
index cf12e9d..1e00cc6 100644
--- a/src/database.h
+++ b/src/database.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 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,12 +20,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef DATABASE_H
 #define DATABASE_H
 
-struct database *find_database(const char *id, struct conf_service *service);
+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,
-        void (*fun)(void *context, struct session_database *db));
+        void (*fun)(struct session *se, struct session_database *db));
 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);
-int resolve_database(struct database *db);
 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);
+
+
 #endif