projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add check of configuration (-t).
[pazpar2-moved-to-github.git]
/
src
/
database.c
diff --git
a/src/database.c
b/src/database.c
index
d580c65
..
d7c3356
100644
(file)
--- a/
src/database.c
+++ b/
src/database.c
@@
-45,27
+45,21
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <netinet/in.h>
#endif
#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
-static NMEM nmem = 0;
+static struct host *hosts = 0; /* thread pr */
-static xmlDoc *get_explain_xml(const char *id)
+static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
+ const char *id)
{
struct stat st;
char *dir;
char path[256];
char ide[256];
{
struct stat st;
char *dir;
char path[256];
char ide[256];
- if (!config || !config->targetprofiles)
- {
- yaz_log(YLOG_WARN, "Config must be loaded and specify targetprofiles");
- return 0;
- }
- if (config->targetprofiles->type != Targetprofiles_local)
+ if (targetprofiles->type != Targetprofiles_local)
{
yaz_log(YLOG_FATAL, "Only supports local type");
return 0;
}
{
yaz_log(YLOG_FATAL, "Only supports local type");
return 0;
}
- dir = config->targetprofiles->src;
+ dir = targetprofiles->src;
urlencode(id, ide);
sprintf(path, "%s/%s", dir, ide);
if (!stat(path, &st))
urlencode(id, ide);
sprintf(path, "%s/%s", dir, ide);
if (!stat(path, &st))
@@
-116,13
+110,11
@@
static struct database *load_database(const char *id,
struct setting *idset;
yaz_log(YLOG_LOG, "New database: %s", id);
struct setting *idset;
yaz_log(YLOG_LOG, "New database: %s", id);
- if (!nmem)
- nmem = nmem_create();
- if (config && config->targetprofiles
- && (doc = get_explain_xml(id)))
+ if (service->targetprofiles
+ && (doc = get_explain_xml(service->targetprofiles, id)))
{
{
- explain = zr_read_xml(nmem, xmlDocGetRootElement(doc));
+ explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
if (!explain)
return 0;
}
if (!explain)
return 0;
}
@@
-136,30
+128,30
@@
static struct database *load_database(const char *id,
dbname = "";
if (!(host = find_host(hostport)))
return 0;
dbname = "";
if (!(host = find_host(hostport)))
return 0;
- db = nmem_malloc(nmem, sizeof(*db));
+ db = nmem_malloc(service->nmem, sizeof(*db));
memset(db, 0, sizeof(*db));
db->host = host;
memset(db, 0, sizeof(*db));
db->host = host;
- db->url = nmem_strdup(nmem, id);
+ db->url = nmem_strdup(service->nmem, id);
db->databases = xmalloc(2 * sizeof(char *));
db->databases = xmalloc(2 * sizeof(char *));
- db->databases[0] = nmem_strdup(nmem, dbname);
+ db->databases[0] = nmem_strdup(service->nmem, dbname);
db->databases[1] = 0;
db->errors = 0;
db->explain = explain;
db->settings = 0;
db->databases[1] = 0;
db->errors = 0;
db->explain = explain;
db->settings = 0;
- db->settings = nmem_malloc(nmem, sizeof(struct settings*) *
+ db->settings = nmem_malloc(service->nmem, sizeof(struct settings*) *
settings_num(service));
memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
settings_num(service));
memset(db->settings, 0, sizeof(struct settings*) * settings_num(service));
- idset = nmem_malloc(nmem, sizeof(*idset));
+ idset = nmem_malloc(service->nmem, sizeof(*idset));
idset->precedence = 0;
idset->name = "pz:id";
idset->target = idset->value = db->url;
idset->next = 0;
db->settings[PZ_ID] = 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;
+ db->next = service->databases;
+ service->databases = db;
return db;
}
return db;
}
@@
-172,7
+164,7
@@
struct database *find_database(const char *id, int new,
struct database *p;
if (!new)
{
struct database *p;
if (!new)
{
- for (p = databases; p; p = p->next)
+ for (p = service->databases; p; p = p->next)
if (!strcmp(p->url, id))
return p;
}
if (!strcmp(p->url, id))
return p;
}
@@
-287,7
+279,7
@@
int predef_grep_databases(void *context, struct conf_service *service,
struct database *p;
int i = 0;
struct database *p;
int i = 0;
- for (p = databases; p; p = p->next)
+ for (p = service->databases; p; p = p->next)
if (database_match_criteria(p->settings, service, cl))
{
(*fun)(context, p);
if (database_match_criteria(p->settings, service, cl))
{
(*fun)(context, p);