X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=41d9431bc194aad59b819a82c81a23c863185a32;hb=e356b466f900722adf6c4f13588e2bed05555134;hp=1fd5d55653525f79a8881ca185d4a5ee69a80c83;hpb=3e47667de1ebfaf4f42d2c0b71d4da2650ce7eb8;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 1fd5d55..41d9431 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 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
@@ -20,9 +20,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef PAZPAR2_CONFIG_H
 #define PAZPAR2_CONFIG_H
 
-#include "normalize_record.h"
+#include "normalize_cache.h"
 
 #include <yaz/nmem.h>
+#include <yaz/mutex.h>
 #include "charsets.h"
 
 enum conf_metadata_type {
@@ -77,7 +78,7 @@ struct conf_metadata
     enum conf_metadata_type type;
     enum conf_metadata_merge merge;
     enum conf_setting_type setting; // Value is to be taken from session/db settings?
-    enum conf_metadata_type mergekey;
+    enum conf_metadata_mergekey mergekey;
 };
 
 
@@ -97,6 +98,7 @@ struct conf_server;
 // however, only a single service is possible.
 struct conf_service
 {
+    YAZ_MUTEX mutex;
     int num_metadata;
     struct conf_metadata *metadata;
     int num_sortkeys;
@@ -135,6 +137,7 @@ struct conf_server
     struct sockaddr_in *proxy_addr;
     int listener_socket;
     char *server_settings;
+    char *server_id;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;