Skip to content

Allow + symbol in label entities #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Allow + symbol in label entities #926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions niworkflows/data/nipreps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
"entities": [
{
"name": "subject",
"pattern": "[/\\\\]+sub-([a-zA-Z0-9]+)",
"pattern": "[/\\\\]+sub-([a-zA-Z0-9+]+)",
"directory": "{subject}"
},
{
"name": "session",
"pattern": "[_/\\\\]+ses-([a-zA-Z0-9]+)",
"pattern": "[_/\\\\]+ses-([a-zA-Z0-9+]+)",
"mandatory": false,
"directory": "{subject}{session}"
},
{
"name": "task",
"pattern": "[_/\\\\]+task-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+task-([a-zA-Z0-9+]+)"
},
{
"name": "acquisition",
"pattern": "[_/\\\\]+acq-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+acq-([a-zA-Z0-9+]+)"
},
{
"name": "ceagent",
"pattern": "[_/\\\\]+ce-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+ce-([a-zA-Z0-9+]+)"
},
{
"name": "reconstruction",
"pattern": "[_/\\\\]+rec-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+rec-([a-zA-Z0-9+]+)"
},
{
"name": "direction",
"pattern": "[_/\\\\]+dir-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+dir-([a-zA-Z0-9+]+)"
},
{
"name": "run",
Expand All @@ -39,11 +39,11 @@
},
{
"name": "proc",
"pattern": "[_/\\\\]+proc-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+proc-([a-zA-Z0-9+]+)"
},
{
"name": "modality",
"pattern": "[_/\\\\]+mod-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+mod-([a-zA-Z0-9+]+)"
},
{
"name": "echo",
Expand All @@ -67,11 +67,11 @@
},
{
"name": "recording",
"pattern": "[_/\\\\]+recording-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+recording-([a-zA-Z0-9+]+)"
},
{
"name": "space",
"pattern": "[_/\\\\]+space-([a-zA-Z0-9\\+]+)"
"pattern": "[_/\\\\]+space-([a-zA-Z0-9+\\+]+)"
},
{
"name": "suffix",
Expand All @@ -95,31 +95,31 @@
},
{
"name": "atlas",
"pattern": "[_/\\\\]+atlas-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+atlas-([a-zA-Z0-9+]+)"
},
{
"name": "roi",
"pattern": "[_/\\\\]+roi-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+roi-([a-zA-Z0-9+]+)"
},
{
"name": "label",
"pattern": "[_/\\\\]+label-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+label-([a-zA-Z0-9+]+)"
},
{
"name": "fmapid",
"pattern": "[_/\\\\]+fmapid-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+fmapid-([a-zA-Z0-9+]+)"
},
{
"name": "desc",
"pattern": "[_/\\\\]+desc-([a-zA-Z0-9]+)"
"pattern": "[_/\\\\]+desc-([a-zA-Z0-9+]+)"
},
{
"name": "from",
"pattern": "(?:^|_)from-([a-zA-Z0-9\\+]+).*xfm"
"pattern": "(?:^|_)from-([a-zA-Z0-9+\\+]+).*xfm"
Copy link
Contributor

@mgxd mgxd Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to from and space already handled the + character, though we can clean these up to simply

Suggested change
"pattern": "(?:^|_)from-([a-zA-Z0-9+\\+]+).*xfm"
"pattern": "(?:^|_)from-([a-zA-Z0-9+]+).*xfm"

Copy link
Contributor Author

@tsalo tsalo Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that! I just did a find and replace. Since this was already merged I can open a PR to fix this.

},
{
"name": "to",
"pattern": "(?:^|_)to-([a-zA-Z0-9\\+]+).*xfm"
"pattern": "(?:^|_)to-([a-zA-Z0-9+\\+]+).*xfm"
},
{
"name": "mode",
Expand All @@ -131,19 +131,19 @@
},
{
"name": "model",
"pattern": "model-([a-zA-Z0-9]+)"
"pattern": "model-([a-zA-Z0-9+]+)"
},
{
"name": "subset",
"pattern": "subset-([a-zA-Z0-9]+)"
"pattern": "subset-([a-zA-Z0-9+]+)"
},
{
"name": "resolution",
"pattern": "res-([a-zA-Z0-9]+)"
"pattern": "res-([a-zA-Z0-9+]+)"
},
{
"name": "density",
"pattern": "res-([a-zA-Z0-9]+)"
"pattern": "res-([a-zA-Z0-9+]+)"
},
{
"name": "cohort",
Expand Down
Loading