diff --git a/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip b/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip
index 24b60a48f33cd9499ddbcd797cab3ad4be1b9746..56dc42703c5bdf8c1936ae6e86f2e981e86770cc 100644
Binary files a/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip and b/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip differ
diff --git a/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip_old b/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip_old
new file mode 100644
index 0000000000000000000000000000000000000000..24b60a48f33cd9499ddbcd797cab3ad4be1b9746
Binary files /dev/null and b/end-to-end-tests/data/crawler_data/ruqad/1222/report.zip_old differ
diff --git a/src/ruqad/resources/crawler-settings/cfood.yaml b/src/ruqad/resources/crawler-settings/cfood.yaml
index 4e2ac18b8ea3959685cc75a3a8d4d4bd9131e05f..5c933380b71afd5853ebc662b351aa21594f99a4 100644
--- a/src/ruqad/resources/crawler-settings/cfood.yaml
+++ b/src/ruqad/resources/crawler-settings/cfood.yaml
@@ -51,7 +51,7 @@ DataDir:
num_total_checks: ^(?P<num_total>[0-9]+)$
num_passing_checks: ^(?P<num_passing>[0-9]+)$
records:
- QualityReportFileElement:
+ QualityCheck:
numTotalChecks: $num_total
numPassingChecks: $num_passing
records:
@@ -61,38 +61,27 @@ DataDir:
role: File
file: $ELNFile
path: $ELNFile
+ QualityCheck:
+ ELNFile: $ELNFileElement
+ FAIRMetadataCheck: true
QualityReportFileElement:
parents:
- QualityReportFile
role: File
file: $QualityReportFile
path: $QualityReportFile
- ELNFile: $ELNFileElement
ELNFile:
type: ELNFile
- transform:
- qualityfilename:
- in: $ELNFile
- out: $QualityReportFile
- functions:
- - replace:
- insert: report.zip
- remove: export.eln
match: ^.*\.eln$
records:
- QualityReportFileElement:
- parents:
- - QualityReportFile
- role: File
- file: $QualityReportFile
- path: $QualityReportFile
ELNFileElement:
parents:
- ELNFile
role: File
file: $ELNFile
path: $ELNFile
- QualityReportFile: $QualityReportFileElement
+ QualityCheck:
+ ELNFile: $ELNFileElement
subtree:
AuthorDataset:
type: ROCrateEntity
@@ -170,28 +159,6 @@ DataDir:
records:
Dataset:
$propid: $propvalue
-
- # MetaData:
- # type: DictElement
- # records:
- # MetaData:
- # Dataset:
- # MetaData: +$MetaData
- # subtree:
- # PropertyID:
- # type: TextElement
- # match_name: propertyID
- # match_value: (?P<propid>.*)$
- # records:
- # MetaData:
- # name: $propid
- # PropertyValue:
- # type: TextElement
- # match_name: value
- # match_value: (?P<propvalue>.*)$
- # records:
- # MetaData:
- # v: $propvalue
Author:
# breakpoint: true
type: DictElement
diff --git a/src/ruqad/resources/crawler-settings/datamodel.yaml b/src/ruqad/resources/crawler-settings/datamodel.yaml
index 72b7b03b5b5cc9d50fb8d0b909b3fb8ec5727e1d..b7fc15c351345bbc380a193fcd131c338df3d6e5 100644
--- a/src/ruqad/resources/crawler-settings/datamodel.yaml
+++ b/src/ruqad/resources/crawler-settings/datamodel.yaml
@@ -41,6 +41,8 @@ ELNFile:
QualityReportFile:
QualityCheck:
+ obligatory_properties:
+ ELNFile:
recommended_properties:
QualityReportFile:
numTotalChecks: