-/* $Id: database.c,v 1.22 2007-04-20 16:21:19 quinn 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 <sys/stat.h>
#include "pazpar2.h"
-#include "config.h"
+#include "host.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
// Create a new host structure for hostport
static struct host *create_host(const char *hostport)
{
- struct addrinfo *addrinfo, hints;
struct host *host;
- char *port;
- char ipport[128];
- unsigned char addrbuf[4];
- int res;
host = xmalloc(sizeof(struct host));
host->hostport = xstrdup(hostport);
host->connections = 0;
+ host->ipport = 0;
- if ((port = strchr(hostport, ':')))
- *(port++) = '\0';
- else
- port = "210";
-
- hints.ai_flags = 0;
- hints.ai_family = PF_INET;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
- hints.ai_addrlen = 0;
- hints.ai_addr = 0;
- hints.ai_canonname = 0;
- hints.ai_next = 0;
- // This is not robust code. It assumes that getaddrinfo always
- // returns AF_INET address.
- if ((res = getaddrinfo(hostport, port, &hints, &addrinfo)))
+ if (host_getaddrinfo(host))
{
- yaz_log(YLOG_WARN, "Failed to resolve %s: %s", hostport, gai_strerror(res));
xfree(host->hostport);
xfree(host);
return 0;
}
- assert(addrinfo->ai_family == PF_INET);
- memcpy(addrbuf, &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4);
- sprintf(ipport, "%u.%u.%u.%u:%s",
- addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
- host->ipport = xstrdup(ipport);
- freeaddrinfo(addrinfo);
host->next = hosts;
hosts = host;
return host;
struct host *host;
char hostport[256];
char *dbname;
+ struct setting *idset;
yaz_log(YLOG_LOG, "New database: %s", id);
if (!nmem)
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;
return load_database(id);
}
-// This whole session_grep database thing should be moved to pazpar2.c
+// This whole session_grep database thing should be moved elsewhere
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;
return i;
}
-// This function will most likely vanish when a proper target profile mechanism is
-// introduced.
-void load_simpletargets(const char *fn)
-{
- FILE *f = fopen(fn, "r");
- char line[256];
-
- if (!f)
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn);
- exit(1);
- }
-
- while (fgets(line, 255, f))
- {
- char *url;
- char *name;
- struct database *db;
-
- if (strncmp(line, "target ", 7))
- continue;
- line[strlen(line) - 1] = '\0';
-
- if ((name = strchr(line, ';')))
- *(name++) = '\0';
-
- url = line + 7;
-
- if (!(db = find_database(url, 0)))
- yaz_log(YLOG_WARN, "Unable to load database %s", url);
- }
- fclose(f);
-}
-
-
/*
* Local variables:
* c-basic-offset: 4
projects / pazpar2-moved-to-github.git / blobdiff