X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdatabase.c;h=342cbc9b0dd2a167e2ab06c701d24e6b3c20991e;hb=60cff803c9deff906722a16ad1a41ece0cbd3163;hp=df6f11aae57c3a1a7b631de91b763a318597f7f5;hpb=dedbc922fbe49e599466f41c618ba9ba8ddb9477;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index df6f11a..342cbc9 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.25 2007-04-23 21:05:23 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"
@@ -158,7 +159,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)
 {
@@ -259,41 +260,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