X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.c;h=43dad51c49a37aaaad948490ce0107d8c4f8f77b;hb=27cfb6d89ca9b02f63f8334b6b8e666cf7db2ff7;hp=f16476370e6a6f502f846fd326c2a1b4d8937787;hpb=8ac64e993e05a743a39e6254c0659c93258e686c;p=pazpar2-moved-to-github.git

diff --git a/src/config.c b/src/config.c
index f164763..43dad51 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.31 2007-04-26 10:19:05 marc Exp $
+/* $Id: config.c,v 1.33 2007-04-27 10:27:35 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -19,7 +19,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
-/* $Id: config.c,v 1.31 2007-04-26 10:19:05 marc Exp $ */
+/* $Id: config.c,v 1.33 2007-04-27 10:27:35 marc Exp $ */
 
 #include <string.h>
 
@@ -59,13 +59,23 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem,
         return 0;
     
     metadata->name = nmem_strdup(nmem, name);
-    metadata->type = type;
-    metadata->merge = merge;
+
+    // enforcing that merge_range is always type_year 
+    if (merge == Metadata_merge_range)
+        metadata->type = Metadata_type_year;
+    else
+        metadata->type = type;
+
+    // enforcing that type_year is always range_merge
+    if (metadata->type == Metadata_type_year)
+        metadata->merge = Metadata_merge_range;
+    else
+        metadata->merge = merge;    
+
     metadata->brief = brief;   
     metadata->termlist = termlist;
     metadata->rank = rank;    
     metadata->sortkey_offset = sortkey_offset;
-
     return metadata;
 }
 
@@ -283,7 +293,8 @@ static struct conf_service *parse_service(xmlNode *node)
                     type = Metadata_type_year;
                 else
                 {
-                    yaz_log(YLOG_FATAL, "Unknown value for metadata/type: %s", xml_type);
+                    yaz_log(YLOG_FATAL, 
+                            "Unknown value for metadata/type: %s", xml_type);
                     return 0;
                 }
             }