updated XML config files to use Xinclude, and to conform to new <retrievalinfo>...

updated recordtransform filter to accept new format
updated master schemas to reflect changes

diff --git a/etc/config-record-transform.xml b/etc/config-record-transform.xml
index 2370a18..ee3481b 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.3 2006-11-29 21:43:37 marc Exp $ -->
+<!-- $Id: config-record-transform.xml,v 1.4 2006-12-12 11:01:40 marc Exp $ -->
 <metaproxy xmlns="http://indexdata.com/metaproxy" version="1.0">
   <start route="start"/>
   <filters>
@@ -18,38 +18,8 @@
         <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"/>
-          <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> -->
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                    href="retrieval-info.xml"/>
       </filter>
       <filter type="log">
         <message>Back</message>

diff --git a/etc/retrieval-info.xml b/etc/retrieval-info.xml
index d72fdfd..652a125 100644 (file)
--- a/etc/retrieval-info.xml
+++ b/etc/retrieval-info.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0"?>
-<!-- $Id: retrieval-info.xml,v 1.2 2006-11-30 23:10:26 marc Exp $ -->
+<!-- $Id: retrieval-info.xml,v 1.3 2006-12-12 11:01:40 marc Exp $ -->
 <retrievalinfo  xmlns="http://indexdata.com/yaz" 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>
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="usmarc" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="marc-8"/>
-    </convert>
+    </backend>
   </retrieval>
-  <retrieval syntax="xml" name="danmarc"
-             backendsyntax="usmarc" backendname="F">
-    <convert>
+  <retrieval syntax="xml" name="danmarc">
+    <backend syntax="usmarc" name="F">
       <marc inputformat="marc" outputformat="marcxchange"
             inputcharset="marc-8"/>
-    </convert>
+    </backend>
   </retrieval>
   <retrieval syntax="xml" name="dc"
-             identifier="info:srw/schema/1/dc-v1.1"
-             backendsyntax="usmarc" backendname="F">
-    <convert>
+             identifier="info:srw/schema/1/dc-v1.1">
+    <backend syntax="usmarc" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="marc-8"/>
       <xslt stylesheet="xml/xslt/MARC21slim2DC.xsl"/>
-    </convert>
+    </backend>
   </retrieval>
 </retrievalinfo>

diff --git a/src/filter_record_transform.cpp b/src/filter_record_transform.cpp
index 0e23da8..47467e5 100644 (file)
--- a/src/filter_record_transform.cpp
+++ b/src/filter_record_transform.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_record_transform.cpp,v 1.6 2006-10-10 09:17:24 adam Exp $
+/* $Id: filter_record_transform.cpp,v 1.7 2006-12-12 11:01:40 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -95,7 +95,7 @@ void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
         if (0 == strcmp((const char *) retrieval_node->name, "retrievalinfo"))
             break;
     }
-    
+
     // read configuration
     if ( 0 != yaz_retrieval_configure(m_retrieval, retrieval_node)){
         std::string msg("RecordTransform filter config: ");

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 7af944d..5819113 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.3 2006-11-30 23:10:26 marc Exp $
+#  $Id: retrievalinfo.rnc,v 1.4 2006-12-12 11:01:40 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -20,6 +20,7 @@
 # see also http://books.xmlschemata.org/relaxng/
 
 namespace y = "http://indexdata.com/yaz"
+
 # need to be in different namespace then metaproxy, otherwise 
 # xslt element definition clashes in XML Schema files
 # namespace y = "http://indexdata.com/metaproxy"
@@ -33,9 +34,11 @@ retrievalinfo =
       attribute syntax { xsd:string },
       attribute name { xsd:string }?,
       attribute identifier { xsd:string }?,
-      attribute backendsyntax { xsd:string }?,
-      attribute backendname { xsd:string }?,
-      element y:convert {
+      #attribute backendsyntax { xsd:string }?,
+      #attribute backendname { xsd:string }?,
+      element y:backend {
+      attribute syntax { xsd:string },
+      attribute name { xsd:string }?,
         element y:marc {
           attribute inputformat { xsd:string },
           attribute outputformat { xsd:string },