X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fdatabase.c;h=0370e898cae0f3eea68fbb812fce090e7973f7b9;hb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;hp=dafb4bc926118e6c21d23c6eb90b2c20def3cb00;hpb=541b55d47e25948f632382f7b96f1fffad00ca7f;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index dafb4bc..0370e89 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,7 +1,5 @@
-/* $Id: database.c,v 1.27 2007-05-18 19:52:52 quinn Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2009 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>
@@ -30,15 +32,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "pazpar2.h"
 #include "host.h"
-#include "config.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
@@ -127,7 +134,7 @@ static struct database *load_database(const char *id)
     if ((dbname = strchr(hostport, '/')))
         *(dbname++) = '\0';
     else
-        dbname = "Default";
+        dbname = "";
     if (!(host = find_host(hostport)))
         return 0;
     db = nmem_malloc(nmem, sizeof(*db));
@@ -144,7 +151,7 @@ static struct database *load_database(const char *id)
 
     db->settings = nmem_malloc(nmem, sizeof(struct settings*) * settings_num());
     memset(db->settings, 0, sizeof(struct settings*) * settings_num());
-    idset = nmem_malloc(nmem, sizeof(*id));
+    idset = nmem_malloc(nmem, sizeof(*idset));
     idset->precedence = 0;
     idset->name = "pz:id";
     idset->target = idset->value = db->url;
@@ -175,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)
@@ -187,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
@@ -259,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;
@@ -277,7 +293,9 @@ int grep_databases(void *context, struct database_criterion *cl,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+