Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	test/test_limit_limitmap.urls

diff --cc src/pazpar2_config.c
Simple merge

diff --cc src/settings.c
Simple merge

diff --cc src/settings.h
Simple merge

diff --cc test/test_limit_limitmap_4.xml
index 117f75a,117f75a..313cf71
--- 1/test/test_limit_limitmap_4.xml
--- 2/test/test_limit_limitmap_4.xml
+++ b/test/test_limit_limitmap_4.xml
@@@ -1,4 -1,4 +1,4 @@@
  <settings target="ID_1">
    <set name="pz:limitmap:author"  value="rpn:@attr 1=1003 @attr 6=3" />
--  <set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />
++  <set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />  
  </settings>

diff --cc test/test_limit_limitmap_settings_3.xml
index bcd1e71,bcd1e71..43bfdee
--- 1/test/test_limit_limitmap_settings_3.xml
--- 2/test/test_limit_limitmap_settings_3.xml
+++ b/test/test_limit_limitmap_settings_3.xml
@@@ -1,4 -1,4 +1,5 @@@
  <settings target="Target-1">
    <set name="pz:limitmap:author"  value="rpn:@attr 1=1003 @attr 6=3" />
    <set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />
++  <set name="pz:limitmap:Mysubject" value="local:subject" />
  </settings>

diff --cc test/test_limit_limitmap_settings_4.xml
index 0d3528f,0d3528f..6004c29
--- 1/test/test_limit_limitmap_settings_4.xml
--- 2/test/test_limit_limitmap_settings_4.xml
+++ b/test/test_limit_limitmap_settings_4.xml
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
--<settings target="Target-1">
--  <set name="pz:limitmap:MySubject" value="local:subject" />
++<settings target="Target-2">
++  <set name="pz:limitmap:Mysubject" value="local:subject" />
  </settings>
  
  

diff --cc test/test_solr.urls
Simple merge