stopped archive data to catchall collections

Donders-Institute · Sep 17, 2020 · 00e9103 · 00e9103
1 parent fba644a
commit 00e9103
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/streamer/lib/modalityMEG.js b/streamer/lib/modalityMEG.js
@@ -489,13 +489,13 @@ var _execStreamerJob = function(name, config, job, cb_remove, cb_done) {
             // step 2: resolve recently updated datasets by project number
             resolveUpdatedDatasets(src, cb);
         },
-        function(prj_ds, cb) {
-            // step 3: archive data to the catch-all collection
-            submitStagerJob(prj_ds, true, 40, 50, cb);
-        },
+        // function(prj_ds, cb) {
+        //     // step 3: archive data to the catch-all collection
+        //     submitStagerJob(prj_ds, true, 40, 50, cb);
+        // },
         function(prj_ds, cb) {
             // step 4: archive data to individual project collection
-            submitStagerJob(prj_ds, false, 50, 60, cb);
+            submitStagerJob(prj_ds, false, 40, 60, cb);
         },
         function(prj_ds, cb) {
             // step 5: rsync data from catchall to individual projects

diff --git a/streamer/lib/modalityMRI.js b/streamer/lib/modalityMRI.js
@@ -458,28 +458,34 @@ var _execStreamerJob = function(name, config, job, cb_remove, cb_done) {
             // project number.
             // The project number can be null if the subject naming
             // convention is not followed.
-            getInstanceFiles(true, true, 0, 30, cb);
+            getInstanceFiles(true, true, 0, 40, cb);
         },
         function(dataPath, projectNumber, cb) {
             // compress series data
-            compressSeriesData(dataPath, projectNumber, 30, 40, cb);
+            compressSeriesData(dataPath, projectNumber, 40, 50, cb);
         },
-        function(dataPath, projectNumber, cb) {
-            // archive DICOM images given by dataPath
-            // to a catch-all collection in RDM.
+        // function(dataPath, projectNumber, cb) {
+        //     // archive DICOM images given by dataPath
+        //     // to a catch-all collection in RDM.
+        //     if ( dataPath ) {
+        //         submitStagerJob(dataPath, projectNumber, true, 40, 50, cb);
+        //     } else {
+        //         // it should never happen that the dataDir of catch-all storage is 'null' or 'undefined'
+        //         // this call terminates the rest async process immediately
+        //         cb('dataPath not found: ' + dataPath, dataPath);
+        //     }
+        // },
+        function( dataPath, projectNumber, cb) {
             if ( dataPath ) {
-                submitStagerJob(dataPath, projectNumber, true, 40, 50, cb);
+                // just convert dataPath back to the directory in which
+                // the instances of the series is stored
+                cb(null, dataPath.replace(new RegExp('\.tar\.gz$'), ''), projectNumber);
             } else {
                 // it should never happen that the dataDir of catch-all storage is 'null' or 'undefined'
                 // this call terminates the rest async process immediately
                 cb('dataPath not found: ' + dataPath, dataPath);
             }
         },
-        function( dataPath, projectNumber, cb) {
-            // just convert dataPath back to the directory in which
-            // the instances of the series is stored
-            cb(null, dataPath.replace(new RegExp('\.tar\.gz$'), ''), projectNumber);
-        },
         function(dataPath, projectNumber, cb) {
             // upload DICOM images in dataPath
             // to the project-specific collection in RDM.

diff --git a/streamer/lib/modalityUSER.js b/streamer/lib/modalityUSER.js
@@ -358,13 +358,13 @@ var _execStreamerJob = function(name, config, job, cb_remove, cb_done) {
             // step 2: rsync data from UI buffer to the catch-all project
             syncPath(pathBuffer, pathCatchall, true, 10, 40, cb);
         },
-        function(out, cb) {
-            // step 3: archive data to the catch-all collection
-            submitStagerJob(pathCatchall, true, 40, 50, cb);
-        },
+        // function(out, cb) {
+        //     // step 3: archive data to the catch-all collection
+        //     submitStagerJob(pathCatchall, true, 40, 50, cb);
+        // },
         function(out, cb) {
             // step 4: archive data to individual project collection
-            submitStagerJob(pathCatchall, false, 50, 60, cb);
+            submitStagerJob(pathCatchall, false, 40, 60, cb);
         },
         function(out, cb) {
             // step 5: rsync data from catchall to individual projects