projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
542fc08
)
Moved the check for PZ_ALLOW
author
Sebastian Hammer
<quinn@indexdata.com>
Wed, 11 Apr 2007 16:48:09 +0000
(16:48 +0000)
committer
Sebastian Hammer
<quinn@indexdata.com>
Wed, 11 Apr 2007 16:48:09 +0000
(16:48 +0000)
src/database.c
patch
|
blob
|
history
diff --git
a/src/database.c
b/src/database.c
index
82830a8
..
39514d4
100644
(file)
--- a/
src/database.c
+++ b/
src/database.c
@@
-1,4
+1,4
@@
-/* $Id: database.c,v 1.12 2007-04-11 13:05:50 quinn Exp $
+/* $Id: database.c,v 1.13 2007-04-11 16:48:09 quinn Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-241,8
+241,6
@@
static int match_criterion(struct setting **settings, struct database_criterion
int database_match_criteria(struct setting **settings, struct database_criterion *cl)
{
int database_match_criteria(struct setting **settings, struct database_criterion *cl)
{
- if (settings && settings[PZ_ALLOW] && *settings[PZ_ALLOW]->value == '0')
- return 0;
for (; cl; cl = cl->next)
if (!match_criterion(settings, cl))
break;
for (; cl; cl = cl->next)
if (!match_criterion(settings, cl))
break;
@@
-261,11
+259,15
@@
int session_grep_databases(struct session *se, struct database_criterion *cl,
int i = 0;
for (p = se->databases; p; p = p->next)
int i = 0;
for (p = se->databases; p; p = p->next)
+ {
+ if (p->settings && p->settings[PZ_ALLOW] && *p->settings[PZ_ALLOW]->value == '0')
+ continue;
if (database_match_criteria(p->settings, cl))
{
(*fun)(se, p);
i++;
}
if (database_match_criteria(p->settings, cl))
{
(*fun)(se, p);
i++;
}
+ }
return i;
}
return i;
}