split config file into retrievalinfo part and common metaproxy config part

diff --git a/etc/Makefile.am b/etc/Makefile.am
index ea834d2..2b4198d 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2006-10-11 13:21:51 marc Exp $
+# $Id: Makefile.am,v 1.7 2006-11-29 21:43:37 marc Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
@@ -31,11 +31,11 @@ EXTRA_DIST = $(etcdata_DATA)
 
 .PHONY: check_rng
 check_rng: 
-       xmllint --noout --relaxng $(rng) $(xmlconfig)
+       xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
 
 .PHONY: check_xsd
 check_xsd: 
-       xmllint --noout --schema $(xsd) $(xmlconfig)
+       xmllint --noout --xinclude --schema $(xsd) $(xmlconfig)
 
 
 check-local:

diff --git a/etc/config-record-transform.xml b/etc/config-record-transform.xml
index 79c8c3c..2370a18 100644 (file)
--- a/etc/config-record-transform.xml
+++ b/etc/config-record-transform.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config-record-transform.xml,v 1.2 2006-11-29 13:00:53 marc Exp $ -->
+<!-- $Id: config-record-transform.xml,v 1.3 2006-11-29 21:43:37 marc Exp $ -->
 <metaproxy xmlns="http://indexdata.com/metaproxy" version="1.0">
   <start route="start"/>
   <filters>
@@ -18,6 +18,9 @@
         <message>Front</message>
       </filter>
       <filter type="record_transform">
+         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                      href="retrieval-info.xml"/>
+        <!--
         <retrievalinfo>
           <retrieval syntax="grs-1"/>
           <retrieval syntax="usmarc" name="F"/>
@@ -46,7 +49,7 @@
               <xslt stylesheet="xml/xslt/MARC21slim2DC.xsl"/>
             </convert>
           </retrieval>
-        </retrievalinfo>
+        </retrievalinfo> -->
       </filter>
       <filter type="log">
         <message>Back</message>

diff --git a/etc/retrieval-info.xml b/etc/retrieval-info.xml
new file mode 100644 (file)
index 0000000..d632bc6
--- /dev/null
+++ b/etc/retrieval-info.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- $Id: retrieval-info.xml,v 1.1 2006-11-29 21:43:37 marc Exp $ -->
+<retrievalinfo  xmlns="http://indexdata.com/metaproxy" version="1.0">
+  <retrieval syntax="grs-1"/>
+  <retrieval syntax="usmarc" name="F"/>
+  <retrieval syntax="usmarc" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"
+             backendsyntax="usmarc" backendname="F">
+    <convert>
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="marc-8"/>
+    </convert>
+  </retrieval>
+  <retrieval syntax="xml" name="danmarc"
+             backendsyntax="usmarc" backendname="F">
+    <convert>
+      <marc inputformat="marc" outputformat="marcxchange"
+            inputcharset="marc-8"/>
+    </convert>
+  </retrieval>
+  <retrieval syntax="xml" name="dc"
+             identifier="info:srw/schema/1/dc-v1.1"
+             backendsyntax="usmarc" backendname="F">
+    <convert>
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="marc-8"/>
+      <xslt stylesheet="xml/xslt/MARC21slim2DC.xsl"/>
+    </convert>
+  </retrieval>
+</retrievalinfo>

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 023fe8a..62ec097 100644 (file)
--- a/xml/schema/retrievalinfo.rnc
+++ b/xml/schema/retrievalinfo.rnc
@@ -1,5 +1,5 @@
 # Metaproxy XML config file schemas
-#  $Id: retrievalinfo.rnc,v 1.1 2006-11-29 14:49:20 marc Exp $
+#  $Id: retrievalinfo.rnc,v 1.2 2006-11-29 21:43:38 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -26,6 +26,7 @@ namespace y = "http://indexdata.com/metaproxy"
 
 retrievalinfo = 
   element y:retrievalinfo { 
+    attribute version { "1.0" },
     element y:retrieval {
       attribute syntax { xsd:string },
       attribute name { xsd:string }?,