X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=08359d600808b9c4353d740763bd10b73cfdb512;hb=9ebc11737580bcae95386cb76539650807b8f166;hp=8ab626e6835b5d70d65a3a176ad4312864c64ad7;hpb=b73890ede1ee6eeb8a07937733871077df6f15b9;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 8ab626e..08359d6 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2011 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
@@ -29,12 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/log.h>
 #include <yaz/nmem.h>
 
+#include "ppmutex.h"
 #include "session.h"
 #include "host.h"
 #include "pazpar2_config.h"
 #include "settings.h"
 #include "http.h"
-#include "zeerex.h"
 #include "database.h"
 
 #include <sys/types.h>
@@ -71,27 +71,6 @@ struct database_hosts {
     YAZ_MUTEX mutex;
 };
 
-static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
-                               const char *id)
-{
-    struct stat st;
-    char *dir;
-    char path[256];
-    char ide[256];
-    if (targetprofiles->type != Targetprofiles_local)
-    {
-        yaz_log(YLOG_FATAL, "Only supports local type");
-        return 0;
-    }
-    dir = targetprofiles->src;
-    urlencode(id, ide);
-    sprintf(path, "%s/%s", dir, ide);
-    if (!stat(path, &st))
-        return xmlParseFile(path);
-    else
-        return 0;
-}
-
 // Create a new host structure for hostport
 static struct host *create_host(const char *hostport, iochan_man_t iochan_man)
 {
@@ -109,8 +88,9 @@ static struct host *create_host(const char *hostport, iochan_man_t iochan_man)
         xfree(host);
         return 0;
     }
-    yaz_mutex_create(&host->mutex);
-    yaz_mutex_set_name(host->mutex, "host");
+    pazpar2_mutex_create(&host->mutex, "host");
+
+    yaz_cond_create(&host->cond_ready);
 
     return host;
 }
@@ -166,6 +146,7 @@ struct database *new_database(const char *id, NMEM nmem)
     struct database *db;
     char hostport[256];
     char *dbname;
+    char *db_comment;
     struct setting *idset;
 
     if (strlen(id) > 255)
@@ -175,6 +156,9 @@ struct database *new_database(const char *id, NMEM nmem)
         *(dbname++) = '\0';
     else
         dbname = "";
+    db_comment = strchr(dbname, '#');
+    if (db_comment)
+        *db_comment = '\0';
     db = nmem_malloc(nmem, sizeof(*db));
     memset(db, 0, sizeof(*db));
     db->host = 0;
@@ -185,7 +169,7 @@ struct database *new_database(const char *id, NMEM nmem)
     db->errors = 0;
     db->explain = 0;
 
-    db->num_settings = PZ_NEGOTIATION_CHARSET+1;
+    db->num_settings = PZ_MAX_EOF;
     db->settings = nmem_malloc(nmem, sizeof(struct settings*) * 
                                db->num_settings);
     memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
@@ -205,15 +189,7 @@ static struct database *load_database(const char *id,
 {
     struct database *db;
     struct zr_explain *explain = 0;
-    xmlDoc *doc = 0;
 
-    if (service->targetprofiles 
-        && (doc = get_explain_xml(service->targetprofiles, id)))
-    {
-        explain = zr_read_xml(service->nmem, xmlDocGetRootElement(doc));
-        if (!explain)
-            return 0;
-    }
     db = new_database(id, service->nmem);
     db->explain = explain;
     db->next = service->databases;
@@ -411,8 +387,7 @@ database_hosts_t database_hosts_create(void)
     database_hosts_t p = xmalloc(sizeof(*p));
     p->hosts = 0;
     p->mutex = 0;
-    yaz_mutex_create(&p->mutex);
-    yaz_mutex_set_name(p->mutex, "database");
+    pazpar2_mutex_create(&p->mutex, "database");
     return p;
 }
 
@@ -425,6 +400,7 @@ void database_hosts_destroy(database_hosts_t *pp)
         {
             struct host *p_next = p->next;
             yaz_mutex_destroy(&p->mutex);
+            yaz_cond_destroy(&p->cond_ready);
             xfree(p->ipport);
             xfree(p->hostport);
             xfree(p);