From a0bd1a56fdea8742a84e0c093b85fee456aae085 Mon Sep 17 00:00:00 2001
From: Eric van der Vlist <vdv@dyomedea.com>
Date: Thu, 12 Apr 2012 14:06:23 +0200
Subject: [PATCH] Adding a priority mechanism

---
 archiver/pipelines/archive-resource.xpl     | 5 ++++-
 archiver/pipelines/archive-set.xpl          | 5 ++++-
 archiver/pipelines/post-archive-request.xpl | 2 +-
 archiver/pipelines/scheduler.xpl            | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/archiver/pipelines/archive-resource.xpl b/archiver/pipelines/archive-resource.xpl
index 59cbc3b..fdaad97 100644
--- a/archiver/pipelines/archive-resource.xpl
+++ b/archiver/pipelines/archive-resource.xpl
@@ -222,6 +222,9 @@ for $as in /archive-set
             <parameter name="uuid" type="string">
               <xsl:value-of select="/root/action/@uuid"/>
             </parameter>
+            <parameter name="priority" type="string">
+              <xsl:value-of select="/root/action/@priority"/>
+            </parameter>
             <parameter name="links" type="node-set">
               <xsl:copy-of select="/root/links"/>
             </parameter>
@@ -237,7 +240,7 @@ for $q in /queue return
         insert 
           for $href in distinct-values($links/link/@abs-href)
             let $link := $links/link[@abs-href = $href][1]
-            return <action uuid="{util:uuid()}" type="archive-resource" url="{$link/@abs-href}" directory=$(directory) filename="{$link/@filename}"/> 
+            return <action priority=$(priority) uuid="{util:uuid()}" type="archive-resource" url="{$link/@abs-href}" directory=$(directory) filename="{$link/@filename}"/> 
         into $q,
         
 for $a in /queue/action where $a/@uuid = $(uuid) return
diff --git a/archiver/pipelines/archive-set.xpl b/archiver/pipelines/archive-set.xpl
index 62334ed..8f89fa7 100644
--- a/archiver/pipelines/archive-set.xpl
+++ b/archiver/pipelines/archive-set.xpl
@@ -31,6 +31,9 @@
                 <parameter name="url" type="string">
                     <xsl:value-of select="/action/@url"/>
                 </parameter>
+                <parameter name="priority" type="string">
+                    <xsl:value-of select="/action/@priority + 1"/>
+                </parameter>
             </config>
         </p:input>
         <p:output name="data" id="data-access-data"/>
@@ -45,7 +48,7 @@ declare namespace util = "http://exist-db.org/xquery/util";
 
 for $q in /queue return
     update 
-        insert <action uuid="{util:uuid()}" type="archive-resource" url=$(url) directory=$(directory) filename=$(filename)/> 
+        insert <action priority=$(priority) uuid="{util:uuid()}" type="archive-resource" url=$(url) directory=$(directory) filename=$(filename)/> 
         into $q,
         
 for $a in /queue/action where $a/@uuid = $(uuid) return
diff --git a/archiver/pipelines/post-archive-request.xpl b/archiver/pipelines/post-archive-request.xpl
index 1fc5885..41df24a 100644
--- a/archiver/pipelines/post-archive-request.xpl
+++ b/archiver/pipelines/post-archive-request.xpl
@@ -23,7 +23,7 @@ declare namespace util = "http://exist-db.org/xquery/util";
 
 for $q in /queue return
     update 
-        insert <action uuid="{util:uuid()}" type="archive-set" url="http://dyomedea.com"/> 
+        insert <action priority="0" uuid="{util:uuid()}" type="archive-set" url="http://dyomedea.com"/> 
         into $q
                 
                 ]]></xquery>
diff --git a/archiver/pipelines/scheduler.xpl b/archiver/pipelines/scheduler.xpl
index 8f60dfe..ca19fb3 100644
--- a/archiver/pipelines/scheduler.xpl
+++ b/archiver/pipelines/scheduler.xpl
@@ -19,8 +19,8 @@
         </p:input>
         <p:input name="param">
             <xquery><![CDATA[
-                
-/queue/action
+
+/queue/action[@priority=max(/queue/action/@priority)]
                 
                 ]]></xquery>
         </p:input>