/* 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
#include <config.h>
#endif
-#include <libxml/parser.h>
-#include <libxml/tree.h>
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <yaz/log.h>
+#include <yaz/nmem.h>
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
#include "host.h"
+#include "pazpar2_config.h"
#include "settings.h"
#include "http.h"
-#include "zeerex.h"
#include "database.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
enum pazpar2_database_criterion_type {
PAZPAR2_STRING_MATCH,
struct database_criterion *next;
};
-static struct host *hosts = 0; /* thread pr */
-
-static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
- const char *id)
-{
- struct stat st;
- char *dir;
- char path[256];
- char ide[256];
- if (targetprofiles->type != Targetprofiles_local)
- {
- yaz_log(YLOG_FATAL, "Only supports local type");
- return 0;
- }
- dir = targetprofiles->src;
- urlencode(id, ide);
- sprintf(path, "%s/%s", dir, ide);
- if (!stat(path, &st))
- return xmlParseFile(path);
- else
- return 0;
-}
-
-// Create a new host structure for hostport
-static struct host *create_host(const char *hostport)
-{
- struct host *host;
-
- host = xmalloc(sizeof(struct host));
- host->hostport = xstrdup(hostport);
- host->connections = 0;
- host->ipport = 0;
-
- if (host_getaddrinfo(host))
- {
- xfree(host->hostport);
- xfree(host);
- return 0;
- }
- host->next = hosts;
- hosts = host;
- return host;
-}
-
-static struct host *find_host(const char *hostport)
-{
- struct host *p;
- for (p = hosts; p; p = p->next)
- if (!strcmp(p->hostport, hostport))
- return p;
- return create_host(hostport);
-}
-
-int resolve_database(struct database *db)
-{
- if (db->host == 0)
- {
- struct host *host;
- char *p;
- char hostport[256];
- strcpy(hostport, db->url);
- if ((p = strchr(hostport, '/')))
- *p = '\0';
- if (!(host = find_host(hostport)))
- return -1;
- db->host = host;
- }
- return 0;
-}
-
-void resolve_databases(struct conf_service *service)
-{
- struct database *db = service->databases;
- for (; db; db = db->next)
- resolve_database(db);
-}
-
struct database *new_database(const char *id, NMEM nmem)
{
struct database *db;
- char hostport[256];
- char *dbname;
struct setting *idset;
- if (strlen(id) > 255)
- return 0;
- strcpy(hostport, id);
- if ((dbname = strchr(hostport, '/')))
- *(dbname++) = '\0';
- else
- dbname = "";
db = nmem_malloc(nmem, sizeof(*db));
- memset(db, 0, sizeof(*db));
- db->host = 0;
- db->url = nmem_strdup(nmem, id);
- db->databases = nmem_malloc(nmem, 2 * sizeof(char *));
- db->databases[0] = nmem_strdup(nmem, dbname);
- db->databases[1] = 0;
- db->errors = 0;
- db->explain = 0;
-
- db->num_settings = PZ_NEGOTIATION_CHARSET+1;
+ db->id = nmem_strdup(nmem, id);
+ db->num_settings = PZ_MAX_EOF;
db->settings = nmem_malloc(nmem, sizeof(struct settings*) *
db->num_settings);
+ db->next = 0;
memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
idset = nmem_malloc(nmem, sizeof(*idset));
idset->precedence = 0;
idset->name = "pz:id";
- idset->target = idset->value = db->url;
+ idset->target = idset->value = db->id;
idset->next = 0;
db->settings[PZ_ID] = idset;
- db->next = 0;
-
- return db;
-}
-
-static struct database *load_database(const char *id,
- struct conf_service *service)
-{
- struct database *db;
- struct zr_explain *explain = 0;
- xmlDoc *doc = 0;
-
- if (service->targetprofiles
- && (doc = get_explain_xml(service->targetprofiles, id)))
- {
- explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
- if (!explain)
- return 0;
- }
- db = new_database(id, service->nmem);
- db->explain = explain;
- db->next = service->databases;
- service->databases = db;
return db;
}
// Return a database structure by ID. Load and add to list if necessary
// new==1 just means we know it's not in the list
-struct database *find_database(const char *id, struct conf_service *service)
+struct database *create_database_for_service(const char *id,
+ struct conf_service *service)
{
struct database *p;
for (p = service->databases; p; p = p->next)
- if (!strcmp(p->url, id))
+ if (!strcmp(p->id, id))
return p;
- return load_database(id, service);
+
+ p = new_database(id, service->nmem);
+
+ p->next = service->databases;
+ service->databases = p;
+
+ return p;
}
// This whole session_grep database thing should be moved elsewhere
// Cycles through databases, calling a handler function on the ones for
// which all criteria matched.
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))
{
struct session_database *p;
NMEM nmem = nmem_create();
projects / pazpar2-moved-to-github.git / blobdiff