diff --git a/unittests/scifolder_cfood.yml b/unittests/scifolder_cfood.yml index 1fd7c98d57b35fa651e36bee2c529a46e3a96cde..5eb33c5a653e5c47a4dba7139256f23df6caae55 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 2a1416b778e96ba57fc216d9763572568703ab75..9bab612b9b37e8e295ee8fd02575de506a98d8fc 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 2e99896fdc357f3afd2b43a08829eec2e52c39c0..969325e91da488011819c338708a33dcfc32c93e 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: