From 950e31a6a1d4249e0f150ca62e0101fa02e2c6a9 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 9 Jan 2015 13:16:11 +0100
Subject: [PATCH] http_client to triplestore.xml

---
 bibframe/config-sparql.xml |    7 -------
 bibframe/triplestore.xml   |   31 ++++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/bibframe/config-sparql.xml b/bibframe/config-sparql.xml
index d52498d..68fcf03 100644
--- a/bibframe/config-sparql.xml
+++ b/bibframe/config-sparql.xml
@@ -13,13 +13,6 @@
         <message>log</message>
       </filter>
       <include src="triplestore.xml"/>
-      <filter type="log">
-	<message>http</message>
-	<category apdu="true"/>
-      </filter>
-      <filter type="http_client">
-        <x-forwarded-for>true</x-forwarded-for>
-      </filter>
       <filter type="bounce"/>
     </route>
   </routes>
diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index 7b10796..47e160a 100644
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -1,11 +1,20 @@
-<filter  xmlns="http://indexdata.com/metaproxy" type="sparql">
-  <db path="Default" uri="http://bibframe.indexdata.com/sparql/">
-   <prefix>rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns</prefix>
-   <prefix>bf: http://bibframe.org/vocab/</prefix>
-   <field>?work ?wtitle</field>
-   <criteria>?work a bf:Work</criteria>
-   <criteria>?work bf:workTitle ?wt</criteria>
-   <criteria>?wt bf:titleValue ?wtitle</criteria>
-   <index type="bf.wtitle">?wt bf:titleValue %v FILTER(contains(%v, %s))</index>
-  </db>
-</filter>
+<filters  xmlns="http://indexdata.com/metaproxy">
+  <filter type="sparql">
+    <db path="Default" uri="http://bibframe.indexdata.com/sparql/">
+      <prefix>rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns</prefix>
+      <prefix>bf: http://bibframe.org/vocab/</prefix>
+      <field>?work ?wtitle</field>
+      <criteria>?work a bf:Work</criteria>
+      <criteria>?work bf:workTitle ?wt</criteria>
+      <criteria>?wt bf:titleValue ?wtitle</criteria>
+      <index type="bf.wtitle">?wt bf:titleValue %v FILTER(contains(%v, %s))</index>
+    </db>
+  </filter>
+  <filter type="log">
+    <message>http</message>
+    <category apdu="true"/>
+  </filter>
+  <filter type="http_client">
+    <x-forwarded-for>true</x-forwarded-for>
+  </filter>
+</filters>
-- 
1.7.10.4