X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=79bd22728e4db33a27cc257e4b0c3d0067f1b77c;hb=f9626956e3c53c8b515e4bf01bc313cfe6015bed;hp=1fd5d55653525f79a8881ca185d4a5ee69a80c83;hpb=3e47667de1ebfaf4f42d2c0b71d4da2650ce7eb8;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 1fd5d55..79bd227 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef PAZPAR2_CONFIG_H #define PAZPAR2_CONFIG_H -#include "normalize_record.h" +#include "normalize_cache.h" #include #include "charsets.h" @@ -77,7 +77,7 @@ 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; + enum conf_metadata_mergekey mergekey; };