Skip to content

Commit 1f6b8b3

Browse files
sven1103KochTobi
andauthored
Apply suggestions from code review
Co-authored-by: Tobias Koch <[email protected]>
1 parent f69e178 commit 1f6b8b3

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# 1.9.0 2021-06-28
44

5-
* Provides new ETL routine written in Java, that will replace all Jython scripts at some point [PR](https://github.com/qbicsoftware/etl-scripts/pull/85)
6-
* Support for nf-core pipeline result registration [PR](https://github.com/qbicsoftware/etl-scripts/pull/85)
7-
* Provides metadata validation for imaging data (OMERO etl). [PR](https://github.com/qbicsoftware/etl-scripts/pull/83)
5+
* Provides new ETL routine written in Java, that will replace all Jython scripts at some point [(#85)](https://github.com/qbicsoftware/etl-scripts/pull/85)
6+
* Support for nf-core pipeline result registration [(#85)](https://github.com/qbicsoftware/etl-scripts/pull/85)
7+
* Provides metadata validation for imaging data (OMERO etl). [(#85)](https://github.com/qbicsoftware/etl-scripts/pull/83)
88

99
## 1.8.0 2021-05-11
1010

drop-boxes/register-all-dropbox/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Please find the source code of the ETL routine that this article is referring to
55

66
## Installation
77

8-
Please provide the Java binaries as JAR from the [Java openBIS dropbox](https://github.com/qbicsoftware/java-openbis-dropboxes) in this directories
8+
Please provide the Java binaries as JAR from the [Java openBIS dropbox](https://github.com/qbicsoftware/java-openbis-dropboxes) in this repositories
99
folder `./lib`.
1010

1111
The DSS needs to be restarted in order to activate this dropbox.
1212

1313
## ETL routine
1414

1515
This dropbox expects a folder containing data and creates new openBIS dataset from it. For more information
16-
please visit [Java openBIS dropbox](https://github.com/qbicsoftware/java-openbis-dropboxes).
16+
please visit [Java openBIS dropbox](https://github.com/qbicsoftware/java-openbis-dropboxes).
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#
22
# Drop box for registering a fastq file as a data set
33
#
4-
# Variables:
5-
# incoming-root-dir
6-
# Path to the directory which contains incoming directories for drop boxes.
7-
incoming-dir = ${incoming-root-dir}/QBiC-register-all-data
4+
85
incoming-data-completeness-condition = marker-file
96
top-level-data-set-handler = ch.systemsx.cisd.etlserver.registrator.api.v2.JavaTopLevelDataSetHandlerV2
107
program-class = life.qbic.registration.MainETL
118
storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
9+
# Variables:
10+
# incoming-root-dir
11+
# Path to the directory which contains incoming directories for drop boxes.
12+
incoming-dir = ${incoming-root-dir}/QBiC-register-all-data

drop-boxes/register-omero-metadata/register-omero.py

-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161

6262
PROPPERTY_FILTER_LIST = ["IMAGE_FILENAME", "INSTRUMENT_USER", "IMAGING_DATE"]
6363

64-
6564
def mapDateString(date_string):
6665
return datetime.datetime.strptime(date_string, INCOMING_DATE_FORMAT).strftime(OPENBIS_DATE_FORMAT)
6766

@@ -380,4 +379,3 @@ def process(transaction):
380379

381380
# 7. Last but not least we create the open science file format for images which is
382381
# OMERO-Tiff and store it in OMERO next to the proprierary vendor format.
383-

0 commit comments

Comments
 (0)