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

diff --git a/NEWS b/NEWS
index b512a9b..52d6fcb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+--- 1.2.4 IN PROGRESS
+
+Support for additional fields in cf.xsl and pazpar2.conf.dist:
+publisher, available, due, location (=locallocation), callno
+(=callnumber), thumburl and score.
+
 --- 1.2.3 2009/11/24
 
 Metadata attribute 'skiparticle' also works for ICU based

diff --git a/debian/changelog b/debian/changelog
index 2cea164..b1204e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+pazpar2 (1.2.3-3indexdata) unstable; urgency=low
+
+  * Upstream: another interrim package.
+
+ -- Mike Taylor <mike@miketaylor.org.uk>  Wed, 13 Jan 2010 15:31:12 +0000
+
+pazpar2 (1.2.3-2indexdata) unstable; urgency=low
+
+  * Upstream: interrim Debian package incorporating some of the changes
+    made between 1.2.3 and 1.2.4.
+
+ -- Mike Taylor <mike@miketaylor.org.uk>  Wed, 13 Jan 2010 14:15:46 +0000
+
 pazpar2 (1.2.3-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 9438c75..65ad69e 100644 (file)
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -20,14 +20,20 @@
     </pz:record>
   </xsl:template>
 
-  <xsl:template match="url">
-    <pz:metadata type="electronic-url">
+  <!--
+      The elements mapped in the following clauses should be kept more
+      or less in sync with those named in builder/templates/search.cft
+      in the "cf" git module.
+  -->
+
+  <xsl:template match="date">
+    <pz:metadata type="publication-date">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="author">
-    <pz:metadata type="author">
+  <xsl:template match="url">
+    <pz:metadata type="electronic-url">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
@@ -38,8 +44,8 @@
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="date">
-    <pz:metadata type="publication-date">
+  <xsl:template match="author">
+    <pz:metadata type="author">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
@@ -50,12 +56,54 @@
     </pz:metadata>
   </xsl:template>
   
+  <xsl:template match="publisher">
+    <pz:metadata type="publisher">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
   <xsl:template match="subject">
     <pz:metadata type="subject">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
+  <xsl:template match="available">
+    <pz:metadata type="available">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="due">
+    <pz:metadata type="due">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="location">
+    <pz:metadata type="locallocation">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="callno">
+    <pz:metadata type="callnumber">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="thumburl">
+    <pz:metadata type="thumburl">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="score">
+    <pz:metadata type="score">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
   <xsl:template match="text()"/>
 
 </xsl:stylesheet>

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 8d8953a..71178b7 100644 (file)
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -231,12 +231,22 @@
       </xsl:for-each>
 
       <xsl:for-each select="marc:datafield[@tag='773']">
-       <pz:metadata type="citation">
-         <xsl:for-each select="*">
-           <xsl:value-of select="normalize-space(.)"/>
-           <xsl:text> </xsl:text>
-         </xsl:for-each>
-       </pz:metadata>
+       <pz:metadata type="citation">
+             <xsl:for-each select="*">
+               <xsl:value-of select="normalize-space(.)"/>
+               <xsl:text> </xsl:text>
+         </xsl:for-each>
+        </pz:metadata>
+        <xsl:if test="marc:subfield[@code='t']">
+         <pz:metadata type="journal-title">
+               <xsl:value-of select="marc:subfield[@code='t']"/>
+          </pz:metadata>          
+        </xsl:if>
+        <xsl:if test="marc:subfield[@code='g']">
+         <pz:metadata type="journal-subpart">
+               <xsl:value-of select="marc:subfield[@code='g']"/>
+          </pz:metadata>          
+        </xsl:if>
       </xsl:for-each>
 
       <xsl:for-each select="marc:datafield[@tag='852']">

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 81bf883..68e4d47 100644 (file)
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -7,26 +7,26 @@
     <settings src="settings/edu.xml"/>
 
     <relevance>
-      <icu_chain id="relevance" locale="el">
-       <transform rule="[:Control:] Any-Remove"/>
-       <tokenize rule="l"/>
-       <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
-       <casemap rule="l"/>
+      <icu_chain id="relevance" locale="en">
+        <transform rule="[:Control:] Any-Remove"/>
+        <tokenize rule="l"/>
+        <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+        <casemap rule="l"/>
       </icu_chain>
     </relevance>
 
     <sort>
-      <icu_chain id="sort" locale="el">
-       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
-       <casemap rule="l"/>
+      <icu_chain id="sort" locale="en">
+        <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+        <casemap rule="l"/>
       </icu_chain>
     </sort>
     
     <mergekey>
-      <icu_chain id="mergekey" locale="el">
-       <tokenize rule="l"/>
-       <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
-       <casemap rule="l"/>
+      <icu_chain id="mergekey" locale="en">
+        <tokenize rule="l"/>
+        <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+        <casemap rule="l"/>
       </icu_chain>
     </mergekey>
     
@@ -50,9 +50,9 @@
       <metadata name="meeting-location"/>
       <metadata name="meeting-date"/>
       <metadata name="date" brief="yes" sortkey="numeric" type="year"
-               merge="range" termlist="yes"/>
+        merge="range" termlist="yes"/>
       <metadata name="title" brief="yes" sortkey="skiparticle"
-               merge="longest" rank="6" mergekey="required"/>
+        merge="longest" rank="6" mergekey="required"/>
       <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
       <metadata name="title-responsibility" brief="yes" merge="longest"/>
       <metadata name="title-dates" brief="yes" merge="longest"/>
@@ -64,15 +64,15 @@
       <metadata name="publication-place"/>
       <metadata name="publication-name"/>
       <metadata name="publication-date"/>
-      <metadata name="physical-extent"/>       
-      <metadata name="physical-format"/>       
-      <metadata name="physical-dimensions"/>   
-      <metadata name="physical-accomp"/>       
-      <metadata name="physical-unittype"/>     
-      <metadata name="physical-unitsize"/>     
-      <metadata name="physical-specified"/>    
+      <metadata name="physical-extent"/>
+      <metadata name="physical-format"/>
+      <metadata name="physical-dimensions"/>
+      <metadata name="physical-accomp"/>
+      <metadata name="physical-unittype"/>
+      <metadata name="physical-unitsize"/>
+      <metadata name="physical-specified"/>
 
-      <metadata name="series-title"/>  
+      <metadata name="series-title"/>
 
       <metadata name="description" brief="yes" merge="unique" rank="3"/>
       <metadata name="subject-long" rank="3"/>
@@ -92,6 +92,8 @@
       <metadata name="publicnote" brief="yes"/>
 
       <!-- journals -->
+      <metadata name="journal-title"/>
+      <metadata name="journal-subpart"/>
       <metadata name="volume-number"/>
       <metadata name="issue-date"/>
       <metadata name="issue-number"/>
@@ -99,6 +101,13 @@
       <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"/>
+      <metadata name="thumburl" brief="yes" merge="unique"/>
+      <metadata name="score"/>
     </service>
   </server>
   

diff --git a/src/logic.c b/src/logic.c
index e1e9b90..be2ec04 100644 (file)
--- a/src/logic.c
+++ b/src/logic.c
@@ -92,7 +92,7 @@ static void log_xml_doc(xmlDoc *doc)
 #endif
     if (lf && len)
     {
-        fwrite(result, 1, len, lf);
+        (void) fwrite(result, 1, len, lf);
         fprintf(lf, "\n");
     }
     xmlFree(result);

diff --git a/src/sel_thread.c b/src/sel_thread.c
index bb52c3c..6e07068 100644 (file)
--- a/src/sel_thread.c
+++ b/src/sel_thread.c
@@ -101,7 +101,7 @@ static void *sel_thread_handler(void *vp)
         pthread_mutex_unlock(&p->mutex);
 
         /* wake up select/poll with a single byte */
-        write(p->fd[1], "", 1);
+        (void) write(p->fd[1], "", 1);
     }        
     pthread_mutex_unlock(&p->mutex);
     return 0;
@@ -207,7 +207,7 @@ void *sel_thread_result(sel_thread_t p)
         p->free_queue = work_this;
         
         data = work_this->data;
-        read(p->fd[0], read_buf, 1);
+        (void) read(p->fd[0], read_buf, 1);
     }
     pthread_mutex_unlock(&p->mutex);
     return data;