-/* $Id: database.c,v 1.25 2007-04-23 21:05:23 adam Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2008 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
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
+
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <libxml/parser.h>
#include <libxml/tree.h>
#include "pazpar2.h"
#include "host.h"
-#include "config.h"
#include "settings.h"
#include "http.h"
#include "zeerex.h"
#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
static struct host *hosts = 0; // The hosts we know about
static struct database *databases = 0; // The databases we know about
struct host *host;
char hostport[256];
char *dbname;
+ struct setting *idset;
yaz_log(YLOG_LOG, "New database: %s", id);
if (!nmem)
if ((dbname = strchr(hostport, '/')))
*(dbname++) = '\0';
else
- dbname = "Default";
+ dbname = "";
if (!(host = find_host(hostport)))
return 0;
db = nmem_malloc(nmem, sizeof(*db));
db->databases[1] = 0;
db->errors = 0;
db->explain = explain;
+
db->settings = 0;
+
+ db->settings = nmem_malloc(nmem, sizeof(struct settings*) * settings_num());
+ memset(db->settings, 0, sizeof(struct settings*) * settings_num());
+ idset = nmem_malloc(nmem, sizeof(*idset));
+ idset->precedence = 0;
+ idset->name = "pz:id";
+ idset->target = idset->value = db->url;
+ idset->next = 0;
+ db->settings[PZ_ID] = idset;
+
db->next = databases;
databases = db;
int match_zurl(const char *zurl, const char *pattern)
{
+ int len;
+
if (!strcmp(pattern, "*"))
return 1;
- else if (!strncmp(pattern, "*/", 2))
+ else if (!strncmp(pattern, "*/", 2)) // host wildcard.. what the heck is that for?
{
char *db = strchr(zurl, '/');
if (!db)
else
return 0;
}
+ else if (*(pattern + (len = strlen(pattern) - 1)) == '*') // db wildcard
+ {
+ if (!strncmp(pattern, zurl, len))
+ return 1;
+ else
+ return 2;
+ }
else if (!strcmp(pattern, zurl))
return 1;
else
{
if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0')
continue;
+ if (!p->settings[PZ_NAME])
+ continue;
if (database_match_criteria(p->settings, cl))
{
(*fun)(se, p);
return i;
}
-int grep_databases(void *context, struct database_criterion *cl,
- void (*fun)(void *context, struct database *db))
+int predef_grep_databases(void *context, struct database_criterion *cl,
+ void (*fun)(void *context, struct database *db))
{
struct database *p;
int i = 0;