DOM authority indexing: fix batch and online indexing

To fully install this patch, the following steps are
necessary:

1. perl Makefile.PL
2. make
3. make update_zebra_conf (or make upgrade)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/etc/zebradb/authorities/etc/dom-config-marc.xml b/etc/zebradb/authorities/etc/dom-config-marc.xml
new file mode 100644 (file)
index 0000000..0985c24
--- /dev/null
+++ b/etc/zebradb/authorities/etc/dom-config-marc.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+$Id: dom-config.xml,v 1.1 2007-12-13 17:42:28 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+-->
+
+<!--
+Authorities DOM config for MARC ISO2709 input
+-->
+<dom>
+  <extract name="index">
+    <xslt stylesheet="authority-zebra-indexdefs.xsl"/>
+  </extract>
+  <retrieve name="F">
+    <xslt stylesheet="identity.xsl" />
+  </retrieve>
+  <retrieve name="usmarc">
+    <xslt stylesheet="identity.xsl" />
+  </retrieve>
+  <retrieve name="marc">
+    <xslt stylesheet="identity.xsl" />
+  </retrieve>
+  <retrieve name="zebra">
+    <xslt stylesheet="zebra.xsl"/>
+  </retrieve>
+  <retrieve name="index">
+    <xslt stylesheet="authority-zebra-indexdefs.xsl"/>
+  </retrieve>
+  <input>
+    <marc inputcharset="utf-8"/>
+  </input>
+</dom>

diff --git a/etc/zebradb/authorities/etc/dom-config.xml b/etc/zebradb/authorities/etc/dom-config.xml
index 0364cd8..7a520e8 100644 (file)
--- a/etc/zebradb/authorities/etc/dom-config.xml
+++ b/etc/zebradb/authorities/etc/dom-config.xml
@@ -22,6 +22,10 @@ along with Zebra; see the file LICENSE.zebra.  If not, write to the
 Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 -->
+
+<!--
+Authorities DOM config for MARC XML input
+-->
 <dom>
   <extract name="index">
     <xslt stylesheet="authority-zebra-indexdefs.xsl"/>
@@ -42,6 +46,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     <xslt stylesheet="authority-zebra-indexdefs.xsl"/>
   </retrieve>
   <input>
-    <marc inputcharset="utf-8"/>
+    <xmlreader level="0"/>
   </input>
 </dom>

diff --git a/etc/zebradb/zebra-authorities-dom.cfg b/etc/zebradb/zebra-authorities-dom.cfg
index ff56653..22123f4 100644 (file)
--- a/etc/zebradb/zebra-authorities-dom.cfg
+++ b/etc/zebradb/zebra-authorities-dom.cfg
@@ -23,6 +23,8 @@ attset: gils.att
 # http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
 # http://www.indexdata.dk/zebra/doc/grs.tkl
 recordtype: dom.__ZEBRA_CONF_DIR__/authorities/etc/dom-config.xml
+marcxml.recordtype: dom.__ZEBRA_CONF_DIR__/authorities/etc/dom-config.xml
+iso2709.recordtype: dom.__ZEBRA_CONF_DIR__/authorities/etc/dom-config-marc.xml
 
 recordId: (bib1,Local-Number)  
 # was auth1