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

diff --git a/src/database.h b/src/database.h
index 08e87ae..1e00cc6 100644
--- a/src/database.h
+++ b/src/database.h
@@ -1,7 +1,5 @@
-/* $Id: database.h,v 1.6 2007-04-11 18:42:25 quinn Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   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
@@ -14,22 +12,29 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef DATABASE_H
 #define DATABASE_H
 
-void load_simpletargets(const char *fn);
-void prepare_databases(void);
-struct database *find_database(const char *id, int new);
-int database_match_criteria(struct session_database *db, struct database_criterion *cl);
-int session_grep_databases(struct session *se, struct database_criterion *cl,
-        void (*fun)(void *context, struct session_database *db));
-int grep_databases(void *context, struct database_criterion *cl,
-        void (*fun)(void *context, struct 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,
+			  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