updated XML framework to reflect move of SRU explain from zeerex_explain filter to...

diff --git a/etc/Makefile.am b/etc/Makefile.am
index f74d429..0df1822 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.8 2007-01-02 15:35:36 marc Exp $
+# $Id: Makefile.am,v 1.9 2007-01-08 13:07:38 marc Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
@@ -20,7 +20,7 @@ xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config4.xml \
     $(srcdir)/config5.xml
 
-config = example.simple-auth example.target-auth pqf2pqf.xsl
+config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml
 
 
 rng = $(srcdir)/../xml/schema/metaproxy.rng

diff --git a/etc/config-sru-to-z3950.xml b/etc/config-sru-to-z3950.xml
index 15aa769..e5a655e 100644 (file)
--- a/etc/config-sru-to-z3950.xml
+++ b/etc/config-sru-to-z3950.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config-sru-to-z3950.xml,v 1.11 2007-01-08 10:17:45 marc Exp $ -->
+<!-- $Id: config-sru-to-z3950.xml,v 1.12 2007-01-08 13:07:38 marc Exp $ -->
 <metaproxy 
     xmlns="http://indexdata.com/metaproxy" 
     version="1.0">
@@ -11,9 +11,8 @@
     </filter>
     <filter id="sru" type="sru_z3950">
       <database name="Default">
-        <explain xmlns="http://explain.z3950.org/dtd/2.0/">
-          ...
-        </explain>
+       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                    href="explain.xml"/>
       </database>
       <database name="Dummy"/>
     </filter>
@@ -27,9 +26,6 @@
       <filter type="log">
         <message>SRU/Z3950</message>
       </filter>
-      <filter type="log">
-        <message>ZEEREX</message>
-      </filter>
       <filter refid="sru"/>
       <filter type="log">
         <message>VIRTDB</message>
@@ -39,6 +35,10 @@
           <database>Default</database>
           <target>localhost:9999/Default</target>
         </virtual>
+        <virtual>
+          <database>Dummy</database>
+          <target>localhost:9998/Default</target>
+        </virtual>
       </filter>
       <filter type="backend_test"/>
       <!--

diff --git a/etc/explain.xml b/etc/explain.xml
index b7d1ac7..8564e5d 100644 (file)
--- a/etc/explain.xml
+++ b/etc/explain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- $Id: explain.xml,v 1.1 2007-01-08 10:17:45 marc Exp $ -->
+<!-- $Id: explain.xml,v 1.2 2007-01-08 13:07:38 marc Exp $ -->
 
 <!-- this file configures the SRU/SRW explain response -->
 <!-- see: http://explain.z3950.org/dtd/commentary.html -->
@@ -10,13 +10,13 @@
 <explain xmlns="http://explain.z3950.org/dtd/2.0/">
 
   <serverInfo protocol="SRU">
-    <host>foo.indexdata.dk</host>
-    <port>80</port>
+    <host>foo.somehost.somewhere</host>
+    <port>9000</port>
     <database>Default</database>
   </serverInfo>
 
   <databaseInfo>
-    <title lang="en" primary="true">Metaproxy example SRU explain record</title
+    <title lang="en" primary="true">Metaproxy SRU explain record</title>
     <description lang="en" primary="true">
       Some description of this service
     </description>

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 340221f..9f49097 100644 (file)
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,5 +1,5 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.14 2007-01-05 11:28:48 marc Exp $
+#  $Id: metaproxy.rnc,v 1.15 2007-01-08 13:07:39 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -61,7 +61,7 @@ filter =
     | filter_sru_z3950
     | filter_virt_db
     | filter_z3950_client
-    | filter_zeerex_explain
+#    | filter_zeerex_explain
   }
 
 filter_refid = attribute refid { xsd:NCName }
@@ -161,7 +161,11 @@ filter_session_shared =
 filter_sru_z3950 =
   attribute type { "sru_z3950" },
   attribute id { xsd:NCName }?,
-  attribute name { xsd:NCName }?
+  attribute name { xsd:NCName }?,
+  element mp:database {  
+     attribute name { xsd:NCName },
+     any        
+  }+
 
 filter_virt_db =
   attribute type { "virt_db" },
@@ -179,13 +183,13 @@ filter_z3950_client =
   attribute name { xsd:NCName }?,
   element mp:timeout { xsd:integer }?
 
-filter_zeerex_explain =
-  attribute type { "zeerex_explain" },
-  attribute id { xsd:NCName }?,
-  attribute name { xsd:NCName }?,
-  element mp:database {  
-     attribute name { xsd:NCName },
-     any        
-  }+
+#filter_zeerex_explain =
+#  attribute type { "zeerex_explain" },
+#  attribute id { xsd:NCName }?,
+#  attribute name { xsd:NCName }?,
+#  element mp:database {  
+#     attribute name { xsd:NCName },
+#     any        
+#  }+
 
  
\ No newline at end of file