projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove trailing white space from all files
[arvados.git]
/
sdk
/
R
/
R
/
CollectionTree.R
diff --git
a/sdk/R/R/CollectionTree.R
b/sdk/R/R/CollectionTree.R
index 91e4ec86459dc8e4ad8891d59cbdb80d771a4013..8b2f8876b0f91a0d86e148f81f1d29d87ab2f479 100644
(file)
--- a/
sdk/R/R/CollectionTree.R
+++ b/
sdk/R/R/CollectionTree.R
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
source("./R/Subcollection.R")
source("./R/ArvadosFile.R")
source("./R/util.R")
source("./R/Subcollection.R")
source("./R/ArvadosFile.R")
source("./R/util.R")
@@
-15,7
+19,7
@@
CollectionTree <- R6::R6Class(
treeBranches <- sapply(fileContent, function(filePath)
{
splitPath <- unlist(strsplit(filePath, "/", fixed = TRUE))
treeBranches <- sapply(fileContent, function(filePath)
{
splitPath <- unlist(strsplit(filePath, "/", fixed = TRUE))
- branch <- private$createBranch(splitPath)
+ branch <- private$createBranch(splitPath)
})
root <- Subcollection$new("")
})
root <- Subcollection$new("")
@@
-76,7
+80,7
@@
CollectionTree <- R6::R6Class(
branch <- newFolder
}
}
branch <- newFolder
}
}
-
+
branch
},
branch
},
@@
-90,10
+94,10
@@
CollectionTree <- R6::R6Class(
}
else
{
}
else
{
- # Note: REST always returns folder name alone before other folder
+ # Note: REST always returns folder name alone before other folder
# content, so in first iteration we don't know if it's a file
# content, so in first iteration we don't know if it's a file
- # or folder since its just a name, so we assume it's a file.
- # If we encounter that same name again we know
+ # or folder since its just a name, so we assume it's a file.
+ # If we encounter that same name again we know
# it's a folder so we need to replace ArvadosFile with Subcollection.
if("ArvadosFile" %in% class(child))
{
# it's a folder so we need to replace ArvadosFile with Subcollection.
if("ArvadosFile" %in% class(child))
{