From 380a090acd3c23a1c370bc977efe3c3deed23136 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 23 Aug 2016 15:34:46 -0400
Subject: [PATCH 1/2] #648 check whether we're using the filesystem for modules

---
 deploy/lib/xquery/setup.xqy | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy
index 136525c5..b97adab0 100644
--- a/deploy/lib/xquery/setup.xqy
+++ b/deploy/lib/xquery/setup.xqy
@@ -4012,7 +4012,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-period,
         $task/gr:task-start-time,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)
@@ -4023,7 +4026,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-period,
         $task/gr:task-minute,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)
@@ -4033,7 +4039,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-root,
         $task/gr:task-period,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)
@@ -4045,7 +4054,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-month-day,
         $task/gr:task-start-time,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)
@@ -4055,7 +4067,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-root,
         $task/gr:task-start,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)
@@ -4067,7 +4082,10 @@ declare function setup:create-scheduled-task(
         $task/gr:task-days/gr:task-day,
         $task/gr:task-start-time,
         admin:database-get-id($admin-config, $task/gr:task-database/@name),
-        admin:database-get-id($admin-config, $task/gr:task-modules/@name),
+        if ($task/gr:task-modules/@name eq "filesystem") then
+          0
+        else
+          admin:database-get-id($admin-config, $task/gr:task-modules/@name),
         setup:get-user-id($task/gr:task-user/@name),
         $task/gr:task-host/@name/xdmp:host(.),
         $task/gr:task-priority)

From 3fe71e763cd7895f873b0f04a02d77272c687946 Mon Sep 17 00:00:00 2001
From: Dave Cassel <dmcassel@gmail.com>
Date: Tue, 23 Aug 2016 15:57:08 -0400
Subject: [PATCH 2/2] #648 check for filesystem while wiping scheduled tasks

---
 deploy/lib/xquery/setup.xqy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy
index b97adab0..1d8a35d9 100644
--- a/deploy/lib/xquery/setup.xqy
+++ b/deploy/lib/xquery/setup.xqy
@@ -4120,12 +4120,17 @@ declare function setup:get-scheduled-task(
     admin:group-get-scheduled-tasks(
       $admin-config,
       $group-id)
+  let $modules-db :=
+    if ($task/gr:task-modules/@name eq "filesystem") then
+      0
+    else
+      admin:database-get-id($admin-config, $task/gr:task-modules/@name)
   return
     $tasks[gr:task-path = $task/gr:task-path and
            gr:task-root = $task/gr:task-root and
            gr:task-type = $task/gr:task-type and
            gr:task-database = admin:database-get-id($admin-config, $task/gr:task-database/@name) and
-           gr:task-modules = admin:database-get-id($admin-config, $task/gr:task-modules/@name) and
+           gr:task-modules = $modules-db and
            gr:task-user = xdmp:user($task/gr:task-user/@name)]
           [if ($task/gr:task-period) then gr:task-period = $task/gr:task-period else fn:true()]
            (:[if ($task/gr:task-period) then gr:task-period = $task/gr:task-period else fn:true()]:)