From 16c0ba438136085fcb383944aca4db988cd4050f Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 16 May 2012 15:17:51 +0200
Subject: [PATCH] Updated to have: default limitmap on author, subject and
 medium

---
 etc/services/long_sessions.xml   |   22 +++++++++++++---------
 etc/services/perf.xml            |   25 +++++++++++++++----------
 etc/services/perf_opac_turbo.xml |   23 ++++++++++++++---------
 etc/services/perf_turbo.xml      |   23 ++++++++++++++---------
 etc/services/solr.xml            |   24 +++++++++++++-----------
 5 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/etc/services/long_sessions.xml b/etc/services/long_sessions.xml
index 175e8da..046e816 100644
--- a/etc/services/long_sessions.xml
+++ b/etc/services/long_sessions.xml
@@ -27,12 +27,14 @@
     <set name="pz:piggyback" value="1" />
 
     <!-- field-specific mappings -->
-    <set name="pz:cclmap:au" value="u=1004 s=al"/>
-    <set name="pz:cclmap:ti" value="u=4 s=al"/>
-    <set name="pz:cclmap:su" value="u=21 s=al"/>
-    <set name="pz:cclmap:isbn" value="u=7"/>
-    <set name="pz:cclmap:issn" value="u=8"/>
-    <set name="pz:cclmap:date" value="u=30 r=r"/>
+    <set name="pz:cclmap:au"       value="u=1004 s=al"/>
+    <set name="pz:cclmap:au_exact" value="u=1004 s=al 6=3 "/>
+    <set name="pz:cclmap:ti"       value="u=4 s=al"/>
+    <set name="pz:cclmap:su"       value="u=21 s=al"/>
+    <set name="pz:cclmap:su_exact" value="u=21 s=al 6=3"/>
+    <set name="pz:cclmap:isbn"     value="u=7"/>
+    <set name="pz:cclmap:issn"     value="u=8"/>
+    <set name="pz:cclmap:date"     value="u=30 r=r"/>
 
     <!-- Retrieval settings -->
 
@@ -75,8 +77,9 @@
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
+  <!-- Use the cclmap for author. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
   <metadata name="author" brief="yes" termlist="yes" merge="unique" 
-	    rank="2" mergekey="optional"/>
+	    rank="2" mergekey="optional" facetrule="facet-author" limitmap="ccl:au_exact" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
   <metadata name="corporate-name"/>
@@ -94,7 +97,7 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
-  <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
+  <metadata name="medium" brief="yes" merge="no" mergekey="optional" limitmap="local:" />
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
   <metadata name="publication-place"/>
@@ -111,8 +114,9 @@
   <metadata name="series-title"/>
   
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
+  <!-- Use the cclmap for subject. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
+  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" limitmap="ccl:su_exact" />
   <metadata name="subject-long" rank="3"/>
-  <metadata name="subject" termlist="yes" rank="0"/>
   <metadata name="snippet" brief="yes" merge="unique"/>
   <metadata name="electronic-url" brief="yes" merge="no"/>
   <metadata name="electronic-format-type" />
diff --git a/etc/services/perf.xml b/etc/services/perf.xml
index 521216c..afdde2c 100644
--- a/etc/services/perf.xml
+++ b/etc/services/perf.xml
@@ -28,12 +28,14 @@
     <set name="pz:piggyback" value="0" />
 
     <!-- field-specific mappings -->
-    <set name="pz:cclmap:au" value="u=1004 s=al"/>
-    <set name="pz:cclmap:ti" value="u=4 s=al"/>
-    <set name="pz:cclmap:su" value="u=21 s=al"/>
-    <set name="pz:cclmap:isbn" value="u=7"/>
-    <set name="pz:cclmap:issn" value="u=8"/>
-    <set name="pz:cclmap:date" value="u=30 r=r"/>
+    <set name="pz:cclmap:au"       value="u=1004 s=al"/>
+    <set name="pz:cclmap:au_exact" value="u=1004 s=al 6=3 "/>
+    <set name="pz:cclmap:ti"       value="u=4 s=al"/>
+    <set name="pz:cclmap:su"       value="u=21 s=al"/>
+    <set name="pz:cclmap:su_exact" value="u=21 s=al 6=3"/>
+    <set name="pz:cclmap:isbn"     value="u=7"/>
+    <set name="pz:cclmap:issn"     value="u=8"/>
+    <set name="pz:cclmap:date"     value="u=30 r=r"/>
 
     <!-- Retrieval settings -->
 
@@ -76,8 +78,9 @@
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
+  <!-- Use the cclmap for author. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
   <metadata name="author" brief="yes" termlist="yes" merge="unique" 
-	    rank="2" mergekey="optional" facetrule="facet-author" />
+	    rank="2" mergekey="optional" facetrule="facet-author" limitmap="ccl:au_exact" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
   <metadata name="corporate-name"/>
@@ -95,7 +98,8 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
-  <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
+  <!-- Do a record filtering for medium -->
+  <metadata name="medium" brief="yes" merge="no" mergekey="optional" limitmap="local:" />
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
   <metadata name="publication-place"/>
@@ -112,8 +116,9 @@
   <metadata name="series-title"/>
   
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
-  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" />
-  <metadata name="subject-long" rank="3" />
+  <!-- Use the cclmap for subject. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
+  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" limitmap="ccl:su_exact" />
+  <metadata name="subject-long" rank="3"/>
   <metadata name="snippet" brief="yes" merge="unique"/>
   <metadata name="electronic-url" brief="yes" merge="no"/>
   <metadata name="electronic-format-type" />
diff --git a/etc/services/perf_opac_turbo.xml b/etc/services/perf_opac_turbo.xml
index ba32ee2..12945e0 100644
--- a/etc/services/perf_opac_turbo.xml
+++ b/etc/services/perf_opac_turbo.xml
@@ -28,12 +28,14 @@
     <set name="pz:piggyback" value="1" />
 
     <!-- field-specific mappings -->
-    <set name="pz:cclmap:au" value="u=1004 s=al"/>
-    <set name="pz:cclmap:ti" value="u=4 s=al"/>
-    <set name="pz:cclmap:su" value="u=21 s=al"/>
-    <set name="pz:cclmap:isbn" value="u=7"/>
-    <set name="pz:cclmap:issn" value="u=8"/>
-    <set name="pz:cclmap:date" value="u=30 r=r"/>
+    <set name="pz:cclmap:au"       value="u=1004 s=al"/>
+    <set name="pz:cclmap:au_exact" value="u=1004 s=al 6=3 "/>
+    <set name="pz:cclmap:ti"       value="u=4 s=al"/>
+    <set name="pz:cclmap:su"       value="u=21 s=al"/>
+    <set name="pz:cclmap:su_exact" value="u=21 s=al 6=3"/>
+    <set name="pz:cclmap:isbn"     value="u=7"/>
+    <set name="pz:cclmap:issn"     value="u=8"/>
+    <set name="pz:cclmap:date"     value="u=30 r=r"/>
 
     <!-- Retrieval settings -->
 
@@ -76,8 +78,9 @@
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
+  <!-- Use the cclmap for author. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
   <metadata name="author" brief="yes" termlist="yes" merge="unique" 
-	    rank="2" mergekey="optional" facetrule="facet-author" />
+	    rank="2" mergekey="optional" facetrule="facet-author" limitmap="ccl:au_exact" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
   <metadata name="corporate-name"/>
@@ -95,7 +98,8 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
-  <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
+  <!-- Do a record filtering for medium -->
+  <metadata name="medium" brief="yes" merge="no" mergekey="optional" limitmap="local:" />
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
   <metadata name="publication-place"/>
@@ -112,7 +116,8 @@
   <metadata name="series-title"/>
   
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
-  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" />
+  <!-- Use the cclmap for subject. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
+  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" limitmap="ccl:su_exact" />
   <metadata name="subject-long" rank="3"/>
   <metadata name="snippet" brief="yes" merge="unique"/>
   <metadata name="electronic-url" brief="yes" merge="no"/>
diff --git a/etc/services/perf_turbo.xml b/etc/services/perf_turbo.xml
index 18f9c9a..f5c5674 100644
--- a/etc/services/perf_turbo.xml
+++ b/etc/services/perf_turbo.xml
@@ -28,12 +28,14 @@
     <set name="pz:piggyback" value="1" />
 
     <!-- field-specific mappings -->
-    <set name="pz:cclmap:au" value="u=1004 s=al"/>
-    <set name="pz:cclmap:ti" value="u=4 s=al"/>
-    <set name="pz:cclmap:su" value="u=21 s=al"/>
-    <set name="pz:cclmap:isbn" value="u=7"/>
-    <set name="pz:cclmap:issn" value="u=8"/>
-    <set name="pz:cclmap:date" value="u=30 r=r"/>
+    <set name="pz:cclmap:au"       value="u=1004 s=al"/>
+    <set name="pz:cclmap:au_exact" value="u=1004 s=al 6=3 "/>
+    <set name="pz:cclmap:ti"       value="u=4 s=al"/>
+    <set name="pz:cclmap:su"       value="u=21 s=al"/>
+    <set name="pz:cclmap:su_exact" value="u=21 s=al 6=3"/>
+    <set name="pz:cclmap:isbn"     value="u=7"/>
+    <set name="pz:cclmap:issn"     value="u=8"/>
+    <set name="pz:cclmap:date"     value="u=30 r=r"/>
 
     <!-- Retrieval settings -->
 
@@ -76,8 +78,9 @@
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
+  <!-- Use the cclmap for author. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
   <metadata name="author" brief="yes" termlist="yes" merge="unique" 
-	    rank="2" mergekey="optional" facetrule="facet-author" />
+	    rank="2" mergekey="optional" facetrule="facet-author" limitmap="ccl:au_exact" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
   <metadata name="corporate-name"/>
@@ -95,7 +98,8 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
-  <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
+  <!-- Do a record filtering for medium -->
+  <metadata name="medium" brief="yes" merge="no" mergekey="optional" limitmap="local:" />
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
   <metadata name="publication-place"/>
@@ -112,7 +116,8 @@
   <metadata name="series-title"/>
   
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
-  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" />
+  <!-- Use the cclmap for subject. Can be improved with a completeness. Needs to be overriden for SRU/Solr targets -->
+  <metadata name="subject" termlist="yes" rank="0" facetrule="facet-subject" limitmap="ccl:su_exact" />
   <metadata name="subject-long" rank="3"/>
   <metadata name="snippet" brief="yes" merge="unique"/>
   <metadata name="electronic-url" brief="yes" merge="no"/>
diff --git a/etc/services/solr.xml b/etc/services/solr.xml
index bd7f543..829120e 100644
--- a/etc/services/solr.xml
+++ b/etc/services/solr.xml
@@ -3,19 +3,21 @@
   <timeout session="30" z3950_operation="15" z3950_session="60"/>
   
   <settings target="*">
-    <set target="donut:8983/solr/select" name="pz:name" value="solr1"/>
-    <set target="satay:8983/solr/select" name="pz:name" value="solr2"/>
+    <set target="donut:8983/solr" name="pz:name" value="solr2"/>
+    <set target="ocs-test.indexdata.com/solr" name="pz:name" value="solr1"/>
 
     <!-- mapping for unqualified search -->
     <set name="pz:cclmap:term" value="1=title"/>
 
     <!-- field-specific mappings -->
-    <set name="pz:cclmap:au"   value="1=author" />
-    <set name="pz:cclmap:ti"   value="1=title"  />
-    <set name="pz:cclmap:su"   value="1=subject"/>
-    <set name="pz:cclmap:isbn" value="1=isbn" />
-    <set name="pz:cclmap:issn" value="1=issn" />
-    <set name="pz:cclmap:date" value="1=date" />
+    <set name="pz:cclmap:au"         value="1=author" />
+    <set name="pz:cclmap:au_exact"   value="1=author 6=3" />
+    <set name="pz:cclmap:ti"         value="1=title"  />
+    <set name="pz:cclmap:su"         value="1=subject"/>
+    <set name="pz:cclmap:su_exact"   value="1=subject 6=3"/>
+    <set name="pz:cclmap:isbn"       value="1=isbn" />
+    <set name="pz:cclmap:issn"       value="1=issn" />
+    <set name="pz:cclmap:date"       value="1=date" />
 
     <!-- Retrieval settings -->
 
@@ -64,7 +66,7 @@
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
   <metadata name="author" brief="yes" termlist="yes" merge="unique" 
-	    rank="2" mergekey="optional"/>
+	    rank="2" mergekey="optional" limitmap="ccl:au_exact"/>
   <metadata name="author-title"/>
   <metadata name="author-date"/>
   <metadata name="corporate-name"/>
@@ -82,7 +84,7 @@
   <metadata name="title-dates" brief="yes" merge="longest"/>
   <metadata name="title-medium" brief="yes" merge="longest"/>
   <metadata name="title-number-section" brief="yes" merge="longest"/>
-  <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
+  <metadata name="medium" brief="yes" merge="no" mergekey="optional" limitmap="ccl:medium_exact"/>
   <metadata name="iii-id" brief="yes" merge="no"/>
   <metadata name="edition"/>
   <metadata name="publication-place"/>
@@ -99,7 +101,7 @@
   <metadata name="series-title"/>
   
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
-  <metadata name="subject" termlist="yes" rank="0" />
+  <metadata name="subject" termlist="yes" rank="0" limitmap="ccl:su_exact"/>
   <metadata name="subject-long" rank="3"/>
   <metadata name="snippet" brief="yes" merge="unique"/>
   <metadata name="electronic-url" brief="yes" merge="no"/>
-- 
1.7.10.4