Happy new year

[pazpar2-moved-to-github.git] / src / database.h

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