Added default definition for datasetName

SciCatProject · Dec 21, 2018 · c0e21a4 · c0e21a4
1 parent 4aa0218
commit c0e21a4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/common/models/dataset.js b/common/models/dataset.js
@@ -44,6 +44,20 @@ module.exports = function (Dataset) {
             }
             ctx.instance.version = p.version;
 
+            // sourceFolder handling
+            if(ctx.instance.sourceFolder){
+                // remove trailing slashes
+                ctx.instance.sourceFolder = ctx.instance.sourceFolder.replace(/\/$/, "");
+                // autofill datasetName
+                if (!ctx.instance.datasetName){
+                    var arr=ctx.instance.sourceFolder.split("/")
+                    if(arr.length == 1){
+                        ctx.instance.datasetName=arr[0]
+                    } else {
+                        ctx.instance.datasetName=arr[arr.length-2]+"/"+arr[arr.length-1]
+                    }
+                }
+            }
 
             // auto fill classification
             if (!ctx.instance.ownerGroup) {

diff --git a/common/models/dataset.json b/common/models/dataset.json
@@ -41,7 +41,7 @@
             "type": "string",
             "required": true,
             "index": true,
-            "description": "Absolute file path on file server containing the files of this dataset, optionally including protocol and file server hostname, e.g. nfs://fileserver1.example.com/some/path/to/sourcefolder. In case of a single file dataset, e.g. HDF5 data it contains the path up to, but excluding the filename."
+            "description": "Absolute file path on file server containing the files of this dataset, optionally including protocol and file server hostname, e.g. nfs://fileserver1.example.com/some/path/to/sourcefolder. In case of a single file dataset, e.g. HDF5 data, it contains the path up to, but excluding the filename. Trailing slashes are removed."
         },
         "size": {
             "type": "number",
@@ -80,7 +80,7 @@
         },
         "datasetName": {
             "type": "string",
-            "description": "A name for the dataset, given by the creator to carry some semantic meaning. Useful for display purposes e.g. instead of displaying the pid"            
+            "description": "A name for the dataset, given by the creator to carry some semantic meaning. Useful for display purposes e.g. instead of displaying the pid. Will be autofilled if missing using info from sourceFolder"
         },
         "userTargetLocation": {
             "type": "string",

diff --git a/test/Dataset.js b/test/Dataset.js
@@ -62,6 +62,7 @@ describe('Simple Dataset tests', () => {
                 res.body.should.have.property('version').and.be.string;
                 res.body.should.have.property('type').and.equal('raw');
                 res.body.should.have.property('pid').and.be.string;
+                res.body.should.have.property('datasetName').and.be.string;
                 pid = encodeURIComponent(res.body['pid']);
                 done();
             });