Merge pull request #649 from dmcassel/issue-648

#648 check whether we're using the filesystem for modules

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)
@@ -4102,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()]:)