From 36c91e43abe9f4792bf1f7993552997fe9d157ce Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 19 Jun 2006 13:27:49 +0000
Subject: [PATCH] Updates for new log filter facilities.

---
 etc/config-shared1.xml |   21 +++++++++++++++++++++
 etc/config.xsd         |   17 +++++++++++++++--
 etc/config5.xml        |    7 ++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 etc/config-shared1.xml

diff --git a/etc/config-shared1.xml b/etc/config-shared1.xml
new file mode 100644
index 0000000..5ae3d49
--- /dev/null
+++ b/etc/config-shared1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- $Id: config-shared1.xml,v 1.1 2006-06-19 13:27:49 adam Exp $ -->
+<yp2 xmlns="http://indexdata.dk/yp2/config/1">
+  <start route="start"/>
+  <filters>
+    <filter id="frontend" type="frontend_net">
+      <port>@:9000</port>
+    </filter>
+    <filter id="backend" type="z3950_client">
+    </filter>
+  </filters>
+  <routes>  
+    <route id="start">
+      <filter refid="frontend"/>
+      <filter type="log"/>
+      <filter type="session_shared"/>
+      <filter refid="backend"/>
+    </route>
+  </routes>
+</yp2>
+
diff --git a/etc/config.xsd b/etc/config.xsd
index ba2aa4f..e915697 100644
--- a/etc/config.xsd
+++ b/etc/config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: config.xsd,v 1.17 2006-06-08 22:20:04 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.18 2006-06-19 13:27:49 adam Exp $ -->
 <!--
 	This Schema prescribes the format of YP2 configuration files.
 	Invoke it like this:
@@ -58,7 +58,19 @@
         <xs:element ref="config:timeout"/>
 
 	<!-- type="log" -->
-        <xs:element ref="config:message"/>
+        <xs:sequence>
+         <xs:element minOccurs="0" ref="config:message"/>
+         <xs:element minOccurs="0" ref="config:filename"/>
+         <xs:element minOccurs="0" name="category">
+           <xs:complexType>
+            <xs:attribute name="request-session" type="xs:boolean"/>
+            <xs:attribute name="response-session" type="xs:boolean"/>
+            <xs:attribute name="request-apdu" type="xs:boolean"/>
+            <xs:attribute name="response-apdu" type="xs:boolean"/>
+           </xs:complexType>
+         </xs:element>
+        </xs:sequence>
+
 
 	<!-- type="virt_db" or type="multi" -->
         <xs:sequence>
@@ -129,6 +141,7 @@
   <xs:element name="port" type="xs:string"/>
   <xs:element name="timeout" type="xs:integer"/>
   <xs:element name="message" type="xs:NCName"/>
+  <xs:element name="filename" type="xs:string"/>
   <xs:element name="userRegister" type="xs:string"/>
   <xs:element name="targetRegister" type="xs:string"/>
   <xs:element name="discardUnauthorisedTargets" type="xs:string"/>
diff --git a/etc/config5.xml b/etc/config5.xml
index c832d37..e500af5 100644
--- a/etc/config5.xml
+++ b/etc/config5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config5.xml,v 1.3 2006-03-27 12:53:05 adam Exp $ -->
+<!-- $Id: config5.xml,v 1.4 2006-06-19 13:27:49 adam Exp $ -->
 <!-- Uses dummy backend + query rewrite filter.. -->
 <yp2 xmlns="http://indexdata.dk/yp2/config/1">
   <start route="start"/>
@@ -13,12 +13,17 @@
       <filter refid="frontend"/>
       <filter type="log">
         <message>F</message>
+	<filename>my.log</filename>
       </filter>
       <filter type="query_rewrite">
        <xslt>pqf2pqf.xsl</xslt>
       </filter>
       <filter type="log">
         <message>B</message>
+	<filename>my.log</filename>
+	<category request-session="true" response-session="true"
+		  request-apdu="false" response-apdu="false"
+		  />
       </filter>
       <filter type="backend_test"/>
     </route>
-- 
1.7.10.4