Commit c80335ec authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Miscelenious smaller fixes.

parent 2241d3a1
......@@ -38,7 +38,20 @@ class About extends React.Component {
return (
<div className={classes.root}>
<Markdown>{`
## The nomad**@FAIR** prototype
## The nomad**@FAIRDI** *beta* test
**!Please read this, before you explore this new part of Nomad!**
### About nomad@FAIRDI
After the conclusion of the origin [NOMAD-coe](http://nomad-coe.eu) project,
the newly founded NGO *FAIR Data Infrastructures* (FAIRDI) provides an
umbrella to continue operation and further development of the original Nomad
software. Therefore, we use the name *nomad@FAIRDI* to refer to the new
consolidated nomad data infrastructure.
As a first step, we refined the Nomad upload and data processing.
This is a prototype, a concept, for a continuation of the
[NOMAD-coe](http://nomad-coe.eu) project. It is an attempt to redesign
the nomad software and infrastructure with the following goals in mind:
......
......@@ -26,8 +26,8 @@ class EMSEntryCards extends React.Component {
<CardHeader title="Raw Data and Meta Data Files" />
<CardContent classes={{root: classes.cardContent}}>
<Markdown classes={{root: classes.description}}>{`
The data for this experiment was uploaded to [xenodo.org](https://xenodo.org).
Visit the xenodo entry to download the raw experiment data:
The data for this experiment was uploaded to [zenodo.org](https://zenodo.org).
Visit the zenodo entry to download the raw experiment data:
[${data.repository_url}](${data.repository_url}).
The meta data describing this experiment in its original format, can be
......
......@@ -258,8 +258,9 @@ class Uploads extends React.Component {
<div className={classes.root}>
<Agree message={agreement} cookie="agreedToUploadTerms">
<Help cookie="uploadHelp" component={Markdown}>{`
To upload your own data, please put all relevant files in a
\`*.zip\` or \`*.tar.gz\` archive. We encourage you to add all code input and
To upload your own data, please put all relevant files of all the calculations
you want to upload into a single \`*.zip\` or \`*.tar.gz\` archive.
We encourage you to add all code input and
output files, as well as any other auxiliary files that you might have created.
You can put data from multiple calculations, using your preferred directory
structure, into your archives. Drop your archive file(s) below.
......@@ -272,6 +273,9 @@ class Uploads extends React.Component {
for your data, and later publish the data. The *embargo* might last up to
36 month before it becomes public automatically. During an *embargo*
some meta-data will be available.
There is a limit of 32 GB per upload. Please upload multiple archives, if
you have more than 32 GB of data to upload.
`}</Help>
<Paper className={classes.dropzoneContainer}>
......@@ -282,7 +286,7 @@ class Uploads extends React.Component {
rejectClassName={classes.dropzoneReject}
onDrop={this.onDrop.bind(this)}
>
<p>drop files here</p>
<p>drop .tar.gz or .zip files here</p>
<UploadIcon style={{fontSize: 36}}/>
</Dropzone>
</Paper>
......@@ -290,7 +294,7 @@ class Uploads extends React.Component {
<Help cookie="uploadCommandHelp">{`
Alternatively, you can upload files via the following shell command.
Replace \`<local_file>\` with your archive file. After executing the command,
return here and reload (e.g. press the reload button below).
return here and press the reload button below). The same 32 GB limit applies.
`}</Help>
<Markdown>{`
......
......@@ -208,6 +208,9 @@ class RepoCalcsResource(Resource):
else:
abort(400, message='Invalid owner value. Valid values are all|user|staging, default is all')
with_provernance = not Q('term', **{'uploader.user_id': 1})
q = q & with_provernance if q is not None else with_provernance
data = dict(**request.args)
data.pop('owner', None)
data.pop('scroll', None)
......
......@@ -410,7 +410,7 @@ class UploadCommandResource(Resource):
@login_really_required
def get(self):
""" Get url and example command for shell based uploads. """
upload_url = '%s/uploads' % config.api_url()
upload_url = '%s/uploads/' % config.api_url()
upload_command = 'curl -X PUT -H "X-Token: %s" "%s" -F file=@<local_file>' % (
g.user.get_auth_token().decode('utf-8'), upload_url)
......
......@@ -384,7 +384,7 @@ parsers = [
mainfile_contents_re=r'M O L C A S'
),
MissingParser(
name='parser/molcas', code_name='MOLCAS', domain='DFT',
name='parser/onetep', code_name='ONETEP', domain='DFT',
mainfile_contents_re=r'####### # # ####### ####### ####### ######'
),
# These are supposedly octopus files, but they do not look like octopus files at all
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment