Changeset 11027c0

Timestamp:

13/04/2012 10:53:25 (2 years ago)

Author:

Eric van der Vlist <vdv@dyomedea.com>

Branches:

master

Children:

16cc943

Parents:

a0bd1a5

git-author:

Eric van der Vlist <vdv@dyomedea.com> (13/04/2012 10:53:25)

git-committer:

Eric van der Vlist <vdv@dyomedea.com> (13/04/2012 10:53:25)

Message:

Moving action pipelines in their own directory

Location:

archiver/pipelines

Files:

• actions/README.txt (added)
• actions/archive-resource.xpl (moved) (moved from archiver/pipelines/archive-resource.xpl) (6 diffs)
• actions/archive-set.xpl (moved) (moved from archiver/pipelines/archive-set.xpl) (2 diffs)
• scheduler.xpl (modified) (1 diff)

archiver/pipelines/actions/archive-resource.xpl

@@ -25 +25 @@
   <!-- 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">
@@ -150 +151 @@
       <!-- 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">
@@ -173 +175 @@
       <!-- 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">
@@ -211 +214 @@
       <!-- 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">
@@ -263 +267 @@
       <!-- 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">
@@ -297 +302 @@
       <!-- 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">

archiver/pipelines/actions/archive-set.xpl

@@ -41 +41 @@
 
     <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">
@@ -66 +67 @@
 
     <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">

archiver/pipelines/scheduler.xpl

@@ -34 +34 @@
                 <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>