X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.h;h=4aaad87f5650105674b51faa35bbc66b34a5426d;hb=cca105c35464171daf2945161bf4f6a0a52a4d52;hp=82067e70823f4259dc21e5066b01fface9dd1a4e;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git

diff --git a/src/database.h b/src/database.h
index 82067e7..4aaad87 100644
--- 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) 2006-2010 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,19 @@ 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);
-int database_match_criteria(struct session_database *db, struct database_criterion *cl);
-int session_grep_databases(struct session *se, struct database_criterion *cl,
+typedef struct database_hosts *database_hosts_t;
+struct session_database;
+struct session;
+struct conf_service;
+struct database *find_database(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));
-int predef_grep_databases(void *context, struct database_criterion *cl,
+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 conf_service *service, struct database *db);
+struct database *new_database(const char *id, NMEM nmem);
 
+database_hosts_t database_hosts_create(void);
+void database_hosts_destroy(database_hosts_t *);
 #endif