From 82efdf857db2dc0e541e1d967100962219a7cda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Mon, 12 Sep 2022 09:30:48 +0200
Subject: [PATCH] FIX: the data paper allows a year prefix for the name of the
project level
---
unittests/scifolder_cfood.yml | 4 ++--
unittests/scifolder_extended.yml | 4 ++--
unittests/scifolder_extended2.yml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/unittests/scifolder_cfood.yml b/unittests/scifolder_cfood.yml
index 1fd7c98d..5eb33c5a 100644
--- a/unittests/scifolder_cfood.yml
+++ b/unittests/scifolder_cfood.yml
@@ -16,12 +16,12 @@ Data: # name of the converter
subtree: &template
project_dir: # name of the first subtree element which is a converter
type: Directory
- match: (?P<date>.*?)_(?P<identifier>.*)
+ match: ((?P<year>[0-9]{4,4})_)?(?P<identifier>.*)
records:
Project: # this is an identifiable in this case
parents:
- Project # not needed as the name is equivalent
- date: $date
+ date: $year
identifier: $identifier
subtree:
diff --git a/unittests/scifolder_extended.yml b/unittests/scifolder_extended.yml
index 2a1416b7..9bab612b 100644
--- a/unittests/scifolder_extended.yml
+++ b/unittests/scifolder_extended.yml
@@ -16,12 +16,12 @@ Data: # name of the converter
subtree: &template
project_dir: # name of the first subtree element which is a converter
type: Directory
- match: (?P<date>.*?)_(?P<identifier>.*)
+ match: ((?P<year>[0-9]{4,4})_)?(?P<identifier>.*)
records:
Project: # this is an identifiable in this case
parents:
- Project # not needed as the name is equivalent
- date: $date
+ date: $year
identifier: $identifier
subtree:
diff --git a/unittests/scifolder_extended2.yml b/unittests/scifolder_extended2.yml
index 2e99896f..969325e9 100644
--- a/unittests/scifolder_extended2.yml
+++ b/unittests/scifolder_extended2.yml
@@ -16,12 +16,12 @@ Data: # name of the converter
subtree: &template
project_dir: # name of the first subtree element which is a converter
type: Directory
- match: (?P<date>.*?)_(?P<identifier>.*)
+ match: ((?P<year>[0-9]{4,4})_)?(?P<identifier>.*)
records:
Project: # this is an identifiable in this case
parents:
- Project # not needed as the name is equivalent
- date: $date
+ date: $year
identifier: $identifier
subtree:
--
GitLab