X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.h;h=65a19c3a1b61b14b66c1a68fcfef17b8e599485b;hb=d24daa29f95b96d573b0480d043d0d9e43637cc4;hp=8648b1d31715534989b8deecb34c803409febb32;hpb=cc29eab9f928f6cd0f4231cb2e554e2ac7b0b1f3;p=pazpar2-moved-to-github.git

diff --git a/src/config.h b/src/config.h
index 8648b1d..65a19c3 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.16 2007-04-10 08:48:56 adam 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.
@@ -26,43 +26,68 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
-enum conf_sortkey_type
-{
+#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
+    Metadata_type_year        // A number
+};
+
+enum conf_metadata_merge {
+    Metadata_merge_no,        // Don't merge
+    Metadata_merge_unique,    // Include unique elements in merged block
+    Metadata_merge_longest,   // Include the longest (strlen) value
+    Metadata_merge_range,     // Store value as a range of lowest-highest
+    Metadata_merge_all        // Just include all elements found
+};
+
+enum conf_sortkey_type {
     Metadata_sortkey_relevance,
     Metadata_sortkey_numeric,       // Standard numerical sorting
     Metadata_sortkey_skiparticle,   // Skip leading article when sorting
     Metadata_sortkey_string         // Flat string
 };
 
+
+
 // Describes known metadata elements and how they are to be manipulated
-// An array of these structure provides a 'map' against which discovered metadata
-// elements are matched. It also governs storage, to minimize number of cycles needed
-// at various tages of processing
+// An array of these structure provides a 'map' against which
+// discovered metadata elements are matched. It also governs storage,
+// to minimize number of cycles needed at various tages of processing
 struct conf_metadata 
 {
-    char *name;  // The name of this element. Output by normalization stylesheet
+    char *name;  // The field name. Output by normalization stylesheet
     int brief;   // Is this element to be returned in the brief format?
     int termlist;// Is this field to be treated as a termlist for browsing?
-    int rank;    // Rank factor. 0 means don't use this field for ranking, 1 is default
+    int rank;    // Rank factor. 0 means don't use this field for ranking, 
+                 // 1 is default
                  // values >1  give additional significance to a field
     int sortkey_offset; // -1 if it's not a sortkey, otherwise index
                         // into service/record_cluster->sortkey array
-    enum
-    {
-        Metadata_type_generic,          // Generic text field
-        Metadata_type_number,           // A number
-        Metadata_type_year              // A number
-    } type;
-    enum
-    {
-        Metadata_merge_no,              // Don't merge
-        Metadata_merge_unique,          // Include unique elements in merged block
-        Metadata_merge_longest,         // Include the longest (strlen) value
-        Metadata_merge_range,           // Store value as a range of lowest-highest
-        Metadata_merge_all              // Just include all elements found
-    } merge;
+    enum conf_metadata_type type;
+    enum conf_metadata_merge merge;
 };
 
+
+
+struct conf_metadata * conf_metadata_assign(NMEM nmem, 
+                                            struct conf_metadata * metadata,
+                                            const char *name,
+                                            enum conf_metadata_type type,
+                                            enum conf_metadata_merge merge,
+                                            int brief,
+                                            int termlist,
+                                            int rank,
+                                            int sortkey_offset);
+
+
+
 // Controls sorting
 struct conf_sortkey
 {
@@ -70,17 +95,52 @@ struct conf_sortkey
     enum conf_sortkey_type type;
 };
 
-// It is conceivable that there will eventually be several 'services' offered
-// from one server, with separate configuration -- possibly more than one services
-// associated with the same port. For now, however, only a single service is possible.
+struct conf_sortkey * conf_sortkey_assign(NMEM nmem, 
+                                            struct conf_sortkey * sortkey,
+                                            const char *name,
+                                            enum conf_sortkey_type type);
+
+
+
+// It is conceivable that there will eventually be several 'services'
+// offered from one server, with separate configuration -- possibly
+// more than one services associated with the same port. For now,
+// however, only a single service is possible.
 struct conf_service
 {
     int num_metadata;
     struct conf_metadata *metadata;
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
+
 };
 
+struct conf_service * conf_service_create(NMEM nmem, 
+                                          int num_metadata, int num_sortkeys);
+
+struct conf_metadata* conf_service_add_metadata(NMEM nmem, 
+                                                struct conf_service *service,
+                                                int field_id,
+                                                const char *name,
+                                                enum conf_metadata_type type,
+                                                enum conf_metadata_merge merge,
+                                                int brief,
+                                                int termlist,
+                                                int rank,
+                                                int sortkey_offset);
+
+struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
+                                               struct conf_service *service,
+                                               int field_id,
+                                               const char *name,
+                                               enum conf_sortkey_type type);
+
+
+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
 {
     char *host;
@@ -88,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;
 };