Minor refactor WRT databases

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

diff --git a/src/database.h b/src/database.h
index 4aaad87..1394732 100644 (file)
--- 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) 2006-2011 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
@@ -24,15 +24,18 @@ 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);
+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 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 *);
+
+struct host *find_host(database_hosts_t hosts, const char *hostport);
+
 #endif