From 11027c068ade8f0e3237470154e9c7bc4a05aa35 Mon Sep 17 00:00:00 2001
From: Eric van der Vlist <vdv@dyomedea.com>
Date: Fri, 13 Apr 2012 10:53:25 +0200
Subject: [PATCH] Moving action pipelines in their own directory

---
 archiver/pipelines/actions/README.txt          | 11 +++++++++++
 .../{ => actions}/archive-resource.xpl         | 18 ++++++++++++------
 .../pipelines/{ => actions}/archive-set.xpl    |  6 ++++--
 archiver/pipelines/scheduler.xpl               |  5 +++--
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 archiver/pipelines/actions/README.txt
 rename archiver/pipelines/{ => actions}/archive-resource.xpl (97%)
 rename archiver/pipelines/{ => actions}/archive-set.xpl (96%)

diff --git a/archiver/pipelines/actions/README.txt b/archiver/pipelines/actions/README.txt
new file mode 100644
index 0000000..ca4c684
--- /dev/null
+++ b/archiver/pipelines/actions/README.txt
@@ -0,0 +1,11 @@
+Pipelines in this directory are called by the scheduler.
+
+Their name is the name of the corresponding action.
+
+Inputs:
+
+    * data: the action
+
+Outputs: None
+
+These pipelines must take care of removing the action from the queue once they are done.
diff --git a/archiver/pipelines/archive-resource.xpl b/archiver/pipelines/actions/archive-resource.xpl
similarity index 97%
rename from archiver/pipelines/archive-resource.xpl
rename to archiver/pipelines/actions/archive-resource.xpl
index fdaad97..95b57c8 100644
--- a/archiver/pipelines/archive-resource.xpl
+++ b/archiver/pipelines/actions/archive-resource.xpl
@@ -24,7 +24,8 @@
 
   <!-- Store the archive in the database -->
   <p:processor name="oxf:pipeline">
-    <p:input name="config" href="data-access.xpl"/>
+    <p:input name="config" href="/data-access.xpl
+"/>
     <p:input name="data" transform="oxf:xslt" href="#data">
       <config xsl:version="2.0">
         <relpath>
@@ -149,7 +150,8 @@
 
       <!-- Store the rewritten document in the database -->
       <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="#data">
           <config xsl:version="2.0">
             <relpath>
@@ -172,7 +174,8 @@
 
       <!-- Update the archive index -->
       <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="#data">
           <config xsl:version="2.0">
             <relpath>
@@ -210,7 +213,8 @@ for $as in /archive-set
 
       <!-- Update the queue -->
       <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="aggregate('root', #data, #links)">
           <config xsl:version="2.0">
             <relpath>queue.xml</relpath>
@@ -262,7 +266,8 @@ for $a in /queue/action where $a/@uuid = $(uuid) return
     <p:otherwise>
       <!-- Update the archive index -->
       <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="#data">
           <config xsl:version="2.0">
             <relpath>
@@ -296,7 +301,8 @@ for $as in /archive-set
 
       <!-- Update the queue -->
       <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="#data">
           <config xsl:version="2.0">
             <relpath>queue.xml</relpath>
diff --git a/archiver/pipelines/archive-set.xpl b/archiver/pipelines/actions/archive-set.xpl
similarity index 96%
rename from archiver/pipelines/archive-set.xpl
rename to archiver/pipelines/actions/archive-set.xpl
index 8f89fa7..a705075 100644
--- a/archiver/pipelines/archive-set.xpl
+++ b/archiver/pipelines/actions/archive-set.xpl
@@ -40,7 +40,8 @@
     </p:processor>
 
     <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" href="#data-access-data"/>
         <p:input name="param">
             <xquery><![CDATA[
@@ -65,7 +66,8 @@ for $a in /queue/action where $a/@uuid = $(uuid) return
     </p:processor>
 
     <p:processor name="oxf:pipeline">
-        <p:input name="config" href="data-access.xpl"/>
+        <p:input name="config" href="/data-access.xpl
+"/>
         <p:input name="data" transform="oxf:xslt" href="#data-access-data">
             <config xsl:version="2.0">
                 <relpath>
diff --git a/archiver/pipelines/scheduler.xpl b/archiver/pipelines/scheduler.xpl
index ca19fb3..fb02905 100644
--- a/archiver/pipelines/scheduler.xpl
+++ b/archiver/pipelines/scheduler.xpl
@@ -33,8 +33,9 @@
             <p:input name="config" transform="oxf:xslt" href="current()">
                 <config xsl:version="2.0">
                     <url>
-                        <xsl:text>oxf:/</xsl:text>
-                        <xsl:value-of select="/action/@type"/>
+                        <xsl:text>oxf:/actions/</xsl:text>
+                        <!-- Remove / and \ for security reasons -->
+                        <xsl:value-of select="translate(/action/@type, '/\', '')"/>
                         <xsl:text>.xpl</xsl:text>
                     </url>
                 </config>