Added IE/FF compatibility functions.

[pazpar2-moved-to-github.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index a1a3448..65a19c3 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.20 2007-04-23 08:48:50 marc Exp $
+/* $Id: config.h,v 1.25 2007-06-08 13:58:46 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -28,6 +28,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/nmem.h>
 
+#ifdef HAVE_ICU
+#include "icu_I18N.h"
+#endif // HAVE_ICU
+
+
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
     Metadata_type_number,     // A number
@@ -107,6 +112,7 @@ struct conf_service
     struct conf_metadata *metadata;
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
+
 };
 
 struct conf_service * conf_service_create(NMEM nmem, 
@@ -114,7 +120,7 @@ struct conf_service * conf_service_create(NMEM nmem,
 
 struct conf_metadata* conf_service_add_metadata(NMEM nmem, 
                                                 struct conf_service *service,
-                                                int position,
+                                                int field_id,
                                                 const char *name,
                                                 enum conf_metadata_type type,
                                                 enum conf_metadata_merge merge,
@@ -125,12 +131,14 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem,
 
 struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
                                                struct conf_service *service,
-                                               int position,
+                                               int field_id,
                                                const char *name,
                                                enum conf_sortkey_type type);
 
 
-int conf_service_field_id(struct conf_service *service, const char * name);
+int conf_service_metadata_field_id(struct conf_service *service, const char * name);
+
+int conf_service_sortkey_field_id(struct conf_service *service, const char * name);
 
 
 struct conf_server
@@ -140,9 +148,12 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    char *zproxy_host;
-    int zproxy_port;
     char *settings;
+
+#ifdef HAVE_ICU
+    struct icu_chain * icu_chn;
+#endif // HAVE_ICU
+
     struct conf_service *service;
     struct conf_server *next;
 };