type_year _and_ enforcing that type_year is always range_merge, thus
setting contrains correctly at beginning of a server session setting
processing.
Removing these then unnecessary tests from ingest_record(), where
there will produce warnings logs nobody can do anything about at that
time, and where they are run for each ingested record.
Less code, less performed if statements, no unnecessary warning logs.
-/* $Id: config.c,v 1.32 2007-04-27 09:38:13 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.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
-/* $Id: config.c,v 1.32 2007-04-27 09:38:13 marc Exp $ */
+/* $Id: config.c,v 1.33 2007-04-27 10:27:35 marc Exp $ */
return 0;
metadata->name = nmem_strdup(nmem, name);
return 0;
metadata->name = nmem_strdup(nmem, name);
- // enforcing that years are always range merged
+ // 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
if (metadata->type == Metadata_type_year)
metadata->merge = Metadata_merge_range;
else
- metadata->merge = merge;
+ metadata->merge = merge;
metadata->brief = brief;
metadata->termlist = termlist;
metadata->brief = brief;
metadata->termlist = termlist;
type = Metadata_type_year;
else
{
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);