X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=1e71619281da239fea36e198864ef1e85ee27d97;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=2a3dab9078c8f5c0d056ee09258aeba272d99293;hpb=5a145dc87e4756afc3e247cded32a9666457f065;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 2a3dab9..1e71619 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 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
@@ -56,6 +56,11 @@ enum conf_setting_type {
     Metadata_setting_parameter      // Expose value to normalization stylesheets
 };
 
+enum conf_metadata_mergekey {
+    Metadata_mergekey_no,
+    Metadata_mergekey_yes
+};
+
 // 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,
@@ -73,23 +78,11 @@ 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;
 };
 
 
 
-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,
-                                            enum conf_setting_type setting,
-                                            int brief,
-                                            int termlist,
-                                            int rank,
-                                            int sortkey_offset);
-
-
-
 // Controls sorting
 struct conf_sortkey
 {
@@ -97,13 +90,6 @@ 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,
@@ -120,7 +106,6 @@ struct conf_service
 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,
@@ -131,7 +116,8 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem,
                                                 int brief,
                                                 int termlist,
                                                 int rank,
-                                                int sortkey_offset);
+                                                int sortkey_offset,
+                                                enum conf_metadata_mergekey mt);
 
 struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
                                                struct conf_service *service,
@@ -190,7 +176,9 @@ xsltStylesheet *conf_load_stylesheet(const char *fname);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+