X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=92281628553f595eb73b506ec327df09e3cd7402;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=df6f11aae57c3a1a7b631de91b763a318597f7f5;hpb=dedbc922fbe49e599466f41c618ba9ba8ddb9477;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index df6f11a..9228162 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.23 2007-04-21 12:00:54 adam Exp $
+/* $Id: database.c,v 1.29 2007-06-28 09:36:10 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -29,6 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/stat.h>
 
 #include "pazpar2.h"
+#include "host.h"
 #include "config.h"
 #include "settings.h"
 #include "http.h"
@@ -106,6 +107,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 +139,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;
 
@@ -158,7 +171,7 @@ struct database *find_database(const char *id, int new)
     return load_database(id);
 }
 
-// This whole session_grep database thing should be moved to pazpar2.c
+// This whole session_grep database thing should be moved elsewhere
 
 int match_zurl(const char *zurl, const char *pattern)
 {
@@ -235,6 +248,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 +259,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;
@@ -259,41 +274,6 @@ int grep_databases(void *context, struct database_criterion *cl,
     return i;
 }
 
-// This function will most likely vanish when a proper target profile mechanism is
-// introduced.
-void load_simpletargets(const char *fn)
-{
-    FILE *f = fopen(fn, "r");
-    char line[256];
-
-    if (!f)
-    {
-        yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", fn);
-        exit(1);
-    }
-
-    while (fgets(line, 255, f))
-    {
-        char *url;
-        char *name;
-        struct database *db;
-
-        if (strncmp(line, "target ", 7))
-            continue;
-        line[strlen(line) - 1] = '\0';
-
-        if ((name = strchr(line, ';')))
-            *(name++) = '\0';
-
-        url = line + 7;
-
-        if (!(db = find_database(url, 0)))
-            yaz_log(YLOG_WARN, "Unable to load database %s", url);
-    }
-    fclose(f);
-}
-
-
 /*
  * Local variables:
  * c-basic-offset: 4