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

diff --git a/src/database.c b/src/database.c
index c0c02df..9228162 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,4 +1,4 @@
-/* $Id: database.c,v 1.22 2007-04-20 16:21:19 quinn 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"
@@ -71,45 +72,19 @@ static xmlDoc *get_explain_xml(const char *id)
 // Create a new host structure for hostport
 static struct host *create_host(const char *hostport)
 {
-    struct addrinfo *addrinfo, hints;
     struct host *host;
-    char *port;
-    char ipport[128];
-    unsigned char addrbuf[4];
-    int res;
 
     host = xmalloc(sizeof(struct host));
     host->hostport = xstrdup(hostport);
     host->connections = 0;
+    host->ipport = 0;
 
-    if ((port = strchr(hostport, ':')))
-        *(port++) = '\0';
-    else
-        port = "210";
-
-    hints.ai_flags = 0;
-    hints.ai_family = PF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_addrlen = 0;
-    hints.ai_addr = 0;
-    hints.ai_canonname = 0;
-    hints.ai_next = 0;
-    // This is not robust code. It assumes that getaddrinfo always
-    // returns AF_INET address.
-    if ((res = getaddrinfo(hostport, port, &hints, &addrinfo)))
+    if (host_getaddrinfo(host))
     {
-        yaz_log(YLOG_WARN, "Failed to resolve %s: %s", hostport, gai_strerror(res));
         xfree(host->hostport);
         xfree(host);
         return 0;
     }
-    assert(addrinfo->ai_family == PF_INET);
-    memcpy(addrbuf, &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4);
-    sprintf(ipport, "%u.%u.%u.%u:%s",
-            addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
-    host->ipport = xstrdup(ipport);
-    freeaddrinfo(addrinfo);
     host->next = hosts;
     hosts = host;
     return host;
@@ -132,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)
@@ -163,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;
 
@@ -184,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)
 {
@@ -261,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);
@@ -270,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;
@@ -285,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