Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xpub-epmc
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Literature-services
public-projects
xpub-epmc
Commits
dc1d1c7d
Commit
dc1d1c7d
authored
3 years ago
by
Audrey Hamelers
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev_k8s'
* dev_k8s: change preprints folder name on external FTP
parents
28635721
ea366afd
No related branches found
Branches containing commit
Tags
xpub-epmc-r4.0.0
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/ftp-integration/toTaggers.js
+2
-2
2 additions, 2 deletions
server/ftp-integration/toTaggers.js
server/utils/ebi-ftp.js
+1
-1
1 addition, 1 deletion
server/utils/ebi-ftp.js
with
3 additions
and
3 deletions
server/ftp-integration/toTaggers.js
+
2
−
2
View file @
dc1d1c7d
...
@@ -371,13 +371,13 @@ function createManifest(tmpPath, manuscript) {
...
@@ -371,13 +371,13 @@ function createManifest(tmpPath, manuscript) {
function
compress
(
tmpPath
,
manuscript
,
preprint
,
datedFolder
)
{
function
compress
(
tmpPath
,
manuscript
,
preprint
,
datedFolder
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
dest
=
`
${
ftpLocation
}${
const
dest
=
`
${
ftpLocation
}${
preprint
?
'
/
_
Preprints
'
:
''
preprint
?
'
/Preprints
'
:
''
}
/
${
datedFolder
}
/
${
manuscript
.
id
}${
}
/
${
datedFolder
}
/
${
manuscript
.
id
}${
manuscript
.
version
>
0
?
`v
${
Math
.
round
(
manuscript
.
version
)}
`
:
''
manuscript
.
version
>
0
?
`v
${
Math
.
round
(
manuscript
.
version
)}
`
:
''
}
.tar.gz`
}
.tar.gz`
const
cmd
=
const
cmd
=
`mkdir -p
${
ftpLocation
}${
`mkdir -p
${
ftpLocation
}${
preprint
?
'
/
_
Preprints
'
:
''
preprint
?
'
/Preprints
'
:
''
}
/
${
datedFolder
}
;`
+
}
/
${
datedFolder
}
;`
+
`sleep 3 ;`
+
`sleep 3 ;`
+
`touch
${
dest
}
;`
+
`touch
${
dest
}
;`
+
...
...
This diff is collapsed.
Click to expand it.
server/utils/ebi-ftp.js
+
1
−
1
View file @
dc1d1c7d
...
@@ -206,7 +206,7 @@ module.exports.uploadTaggersPackage = function uploadTaggersPackage(
...
@@ -206,7 +206,7 @@ module.exports.uploadTaggersPackage = function uploadTaggersPackage(
const
datedFolder
=
filePath
.
match
(
/
\d{4}
-
\d{2}
-
\d{2}
/
)
const
datedFolder
=
filePath
.
match
(
/
\d{4}
-
\d{2}
-
\d{2}
/
)
const
folderPath
=
preprint
const
folderPath
=
preprint
?
`New/Preprints/
${
datedFolder
}
`
?
`New/
_
Preprints/
${
datedFolder
}
`
:
`New/
${
datedFolder
}
`
:
`New/
${
datedFolder
}
`
// create dated folder if not present
// create dated folder if not present
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment