From dbb988ac0169cfc6470b029c73895fe5dd48e43d Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Tue, 31 Jul 2007 22:35:40 +0000
Subject: [PATCH] Included description of settings exposed to records.

---
 NEWS                 |    6 ++++++
 etc/marc21.xsl       |    3 ++-
 test/test_http.cfg   |    4 +++-
 test/test_http.xml   |    5 +++--
 test/test_http_6.res |    8 ++++++--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 60ae266..5c93e41 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Exposed user setting values (i.e. non-pz: names) to the record systems in two
+ways: Either as parameters to the normalization stylesheets (which would allow the
+programmer to postprocess or use the values in any way) or after the normalization
+step, in which case values are made part of the normalized record (and available for
+sorting, termlists, display, or other interface-related use.
+
 Implemented sorting by year.
 
 Option -d dumps records to the current log file instead of stderr.
diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index fa57d4d..785f836 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: marc21.xsl,v 1.15 2007-07-16 15:21:29 adam Exp $ -->
+<!-- $Id: marc21.xsl,v 1.16 2007-07-31 22:35:40 quinn Exp $ -->
 <xsl:stylesheet
     version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
     xmlns:marc="http://www.loc.gov/MARC21/slim">
+
   
   <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
 
diff --git a/test/test_http.cfg b/test/test_http.cfg
index 15ba9e2..2419781 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-<!-- $Id: test_http.cfg,v 1.4 2007-07-30 11:52:08 quinn Exp $ -->
+<!-- $Id: test_http.cfg,v 1.5 2007-07-31 22:35:41 quinn Exp $ -->
 <!-- Used by test_http.sh -->
 <server>
   <listen port="9763"/>
@@ -20,6 +20,8 @@
     <metadata name="description" brief="yes" merge="longest" rank="3"/>
 
     <metadata name="test-usersetting" brief="yes" setting="postproc"/>
+    <metadata name="test" setting="parameter"/>
+    <metadata name="test_usersetting_2" brief="yes"/>
   </service>
 </server>
 
diff --git a/test/test_http.xml b/test/test_http.xml
index 4a86ab2..e632e9d 100644
--- a/test/test_http.xml
+++ b/test/test_http.xml
@@ -1,7 +1,7 @@
 <settings target="z3950.indexdata.com/marc">
 
   <!-- Used by test test_http.sh -->
-  <!-- $Id: test_http.xml,v 1.4 2007-07-30 11:52:08 quinn Exp $ -->
+  <!-- $Id: test_http.xml,v 1.5 2007-07-31 22:35:41 quinn Exp $ -->
 
   <set name="pz:name" value="Local Test"/>
 
@@ -25,8 +25,9 @@
   <set name="pz:nativesyntax" value="iso2709"/>
   <set name="pz:xslt" value="auto"/>
 
-  <!-- Example of application-specific setting -->
+  <!-- Examples of application-specific setting -->
   <!-- Available in output record and/or normalization stylesheet -->
   <set name="test-usersetting" value="XXXXXXXXXX"/>
+  <set name="test" value="YYYYYYYYY"/>
 
 </settings>
diff --git a/test/test_http_6.res b/test/test_http_6.res
index e002fa8..dbd5c2a 100644
--- a/test/test_http_6.res
+++ b/test/test_http_6.res
@@ -9,11 +9,15 @@
 <md-author>Jack Collins</md-author>
 <md-id>11224467</md-id>
 <md-lccn>11224467</md-lccn>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test_usersetting_2>Shit: 
+        YYYYYYYYY</md-test_usersetting_2></location>
 <location id="z3950.indexdata.com/marc" name="Local Test">
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author>
 <md-id>11224466</md-id>
 <md-lccn>11224466</md-lccn>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting></location>
+<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
+<md-test_usersetting_2>Shit: 
+        YYYYYYYYY</md-test_usersetting_2></location>
 </record>
-- 
1.7.10.4