added conf_service creator inclusive metadata and sortkey assigners, added unittests...

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

diff --git a/src/config.h b/src/config.h
index 33014df..4e1d1ad 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.18 2007-04-19 11:57:53 marc Exp $
+/* $Id: config.h,v 1.19 2007-04-19 19:42:30 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -26,29 +26,29 @@ 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>
+
+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
 };
 
-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
-    };
 
 
 // Describes known metadata elements and how they are to be manipulated
@@ -70,7 +70,9 @@ struct conf_metadata
 };
 
 
-struct conf_metadata * conf_metadata_create(NMEM nmem, 
+
+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,
@@ -80,6 +82,7 @@ struct conf_metadata * conf_metadata_create(NMEM nmem,
                                             int sortkey_offset);
 
 
+
 // Controls sorting
 struct conf_sortkey
 {
@@ -87,6 +90,13 @@ struct conf_sortkey
     enum conf_sortkey_type type;
 };
 
+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,
@@ -99,10 +109,12 @@ struct conf_service
     struct conf_sortkey *sortkeys;
 };
 
-struct conf_service * conf_service_create(NMEM nmem);
+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_metadata* conf_service_add_metadata(NMEM nmem, 
                                                 struct conf_service *service,
+                                                int position,
                                                 const char *name,
                                                 enum conf_metadata_type type,
                                                 enum conf_metadata_merge merge,
@@ -111,6 +123,13 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem,
                                                 int rank,
                                                 int sortkey_offset);
 
+struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
+                                               struct conf_service *service,
+                                               int position,
+                                               const char *name,
+                                               enum conf_sortkey_type type);
+
+
 
 struct conf_server
 {