delete-trailing-whitespace

diff --git a/etc/default.xml b/etc/default.xml
index 66312dd..ec2f82d 100644 (file)
--- a/etc/default.xml
+++ b/etc/default.xml
@@ -2,37 +2,37 @@
 <service  xmlns="http://www.indexdata.com/pazpar2/1.0">
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
   <settings src="settings/testserver.xml"/>
-  
+
   <icu_chain id="relevance" locale="en">
     <transform rule="[:Control:] Any-Remove"/>
     <tokenize rule="l"/>
     <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="sort" locale="en">
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="mergekey" locale="en">
     <tokenize rule="l"/>
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="facet" locale="en">
     <display/>
     <transform rule="Title"/>
   </icu_chain>
-  
+
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
   <metadata name="lccn" merge="unique"/>
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
-  <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+  <metadata name="author" brief="yes" termlist="yes" merge="unique"
            rank="2" mergekey="optional" limitmap="ccl: au" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
@@ -66,9 +66,9 @@
   <metadata name="physical-unittype"/>
   <metadata name="physical-unitsize"/>
   <metadata name="physical-specified"/>
-  
+
   <metadata name="series-title"/>
-  
+
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
   <metadata name="subject-long" rank="3"/>
   <metadata name="subject" termlist="yes" rank="0" limitmap="ccl: su" />
@@ -87,7 +87,7 @@
   <metadata name="locallocation" brief="yes"/>
   <metadata name="callnumber" brief="yes"/>
   <metadata name="publicnote" brief="yes"/>
-  
+
   <!-- journals -->
   <metadata name="journal-title"/>
   <metadata name="journal-subpart"/>
@@ -95,12 +95,12 @@
   <metadata name="issue-date"/>
   <metadata name="issue-number"/>
   <metadata name="pages-number"/>
-  
+
   <metadata name="url_recipe" setting="postproc" brief="yes" merge="no"/>
   <metadata name="open_url_resolver" setting="parameter" merge="no"/>
   <metadata name="open-url" merge="longest"/>
   <metadata name="use_url_proxy" setting="postproc" brief="yes" merge="no"/>
-  
+
   <metadata name="publisher"/>
   <metadata name="available"/>
   <metadata name="due"/>

diff --git a/etc/mkc.xml b/etc/mkc.xml
index 37d4484..2ab7cc4 100644 (file)
--- a/etc/mkc.xml
+++ b/etc/mkc.xml
@@ -16,30 +16,30 @@
     <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="sort" locale="en">
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="mergekey" locale="en">
     <tokenize rule="l"/>
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="facet" locale="en">
     <display/>
     <transform rule="Title"/>
   </icu_chain>
-  
+
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
   <metadata name="lccn" merge="unique"/>
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
-  <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+  <metadata name="author" brief="yes" termlist="yes" merge="unique"
            rank="20" mergekey="optional" limitmap="ccl: au" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
@@ -73,9 +73,9 @@
   <metadata name="physical-unittype"/>
   <metadata name="physical-unitsize"/>
   <metadata name="physical-specified"/>
-  
+
   <metadata name="series-title"/>
-  
+
   <metadata name="description" brief="yes" merge="longest" rank="3"/>
   <metadata name="subject-long" rank="3"/>
   <metadata name="subject" termlist="yes" rank="0" limitmap="ccl: su" />
@@ -94,7 +94,7 @@
   <metadata name="locallocation" brief="yes"/>
   <metadata name="callnumber" brief="yes"/>
   <metadata name="publicnote" brief="yes"/>
-  
+
   <!-- journals -->
   <metadata name="journal-title"/>
   <metadata name="journal-subpart"/>
@@ -102,12 +102,12 @@
   <metadata name="issue-date"/>
   <metadata name="issue-number"/>
   <metadata name="pages-number"/>
-  
+
   <metadata name="url_recipe" setting="postproc" brief="yes" merge="no"/>
   <metadata name="open_url_resolver" setting="parameter" merge="no"/>
   <metadata name="open-url" merge="longest"/>
   <metadata name="use_url_proxy" setting="postproc" brief="yes" merge="no"/>
-  
+
   <metadata name="publisher"/>
   <metadata name="available"/>
   <metadata name="due"/>

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 65dad25..4ec5b08 100644 (file)
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
 
-  <file path=".:xsl"/>  
+  <file path=".:xsl"/>
   <server>
     <listen port="9004"/>
     <include src="default.xml"/>
   </server>
-  
+
 </pazpar2>
 <!-- Keep this comment at the end of the file
      Local variables:

diff --git a/etc/perf_server.cfg b/etc/perf_server.cfg
index 943f639..05ff7bd 100644 (file)
--- a/etc/perf_server.cfg
+++ b/etc/perf_server.cfg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
 
-  <file path=".:xsl"/> 
+  <file path=".:xsl"/>
   <threads number="10"/>
   <server id="metasearch_threaded">
-    <listen port="9005"/>
+    <listen port="9004"/>
     <include src="services/*.xml"/>
   </server>
-  
+
 </pazpar2>
 <!-- Keep this comment at the end of the file
      Local variables:

diff --git a/etc/pz2.xsd b/etc/pz2.xsd
index c8bc6ba..6c2b785 100644 (file)
--- a/etc/pz2.xsd
+++ b/etc/pz2.xsd
@@ -1,6 +1,6 @@
-<xs:schema 
-          attributeFormDefault="unqualified" 
-          elementFormDefault="qualified" 
+<xs:schema
+          attributeFormDefault="unqualified"
+          elementFormDefault="qualified"
           xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
           targetNamespace="http://www.indexdata.com/pazpar2/1.0"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"