X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=90697916baade13ba875e618b41fc7324a64a373;hb=67ebd94d4bd94b8ade005dfa371638e0855f84d1;hp=f43cc75b73ec8fef2c9ac5dc0b6a03803f38a3f8;hpb=78a5114a3d2a330bd7c507c4055af0e94688aef1;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index f43cc75..9069791 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,7 +1,5 @@
-/* $Id: database.c,v 1.24 2007-04-22 15:00:56 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
@@ -14,10 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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>
@@ -29,15 +31,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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
@@ -106,6 +114,7 @@ static struct database *load_database(const char *id)
     struct host *host;
     char hostport[256];
     char *dbname;
+    struct setting *idset;
 
     yaz_log(YLOG_LOG, "New database: %s", id);
     if (!nmem)
@@ -137,7 +146,18 @@ static struct database *load_database(const char *id)
     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;
 
@@ -162,9 +182,11 @@ struct database *find_database(const char *id, int new)
 
 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)
@@ -174,6 +196,13 @@ int match_zurl(const char *zurl, const char *pattern)
         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
@@ -235,6 +264,8 @@ int session_grep_databases(struct session *se, struct database_criterion *cl,
     {
         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);
@@ -244,8 +275,8 @@ int session_grep_databases(struct session *se, struct database_criterion *cl,
     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;