From 365eb22d6ce342a74b657c3db63dbecba4002fdc Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Sat, 25 Jul 2020 13:56:03 +0200 Subject: [PATCH 1/5] ocrd-tool schema: be less restrictive on input/ouptut_filegrp --- ocrd_tool.schema.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ocrd_tool.schema.yml b/ocrd_tool.schema.yml index 509990b..f33c4e6 100644 --- a/ocrd_tool.schema.yml +++ b/ocrd_tool.schema.yml @@ -29,7 +29,8 @@ properties: - steps - executable - categories - - input_file_grp + # Not required because not all processors take input from a file group + # - input_file_grp # Not required because not all processors produce output files # - output_file_grp properties: @@ -39,15 +40,18 @@ properties: input_file_grp: description: Input fileGrp@USE this tool expects by default type: array - items: - type: string - pattern: '^OCR-D-[A-Z0-9-]+$' + default: ['PLACEHOLDER'] + # Naming convention is obsolete + #items: + # type: string + # pattern: '^OCR-D-[A-Z0-9-]+$' output_file_grp: description: Output fileGrp@USE this tool produces by default type: array - items: - type: string - pattern: '^OCR-D-[A-Z0-9-]+$' + # Naming convention is obsolete + #items: + # type: string + # pattern: '^OCR-D-[A-Z0-9-]+$' parameters: description: Object describing the parameters of a tool. Keys are parameter names, values sub-schemas. type: object From 1637681fd3ddb0bb1027630857c9e9d0c8c0e2fb Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 27 Jul 2020 12:30:55 +0200 Subject: [PATCH 2/5] Update ocrd_tool.schema.yml Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> --- ocrd_tool.schema.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ocrd_tool.schema.yml b/ocrd_tool.schema.yml index f33c4e6..38f41b1 100644 --- a/ocrd_tool.schema.yml +++ b/ocrd_tool.schema.yml @@ -40,10 +40,11 @@ properties: input_file_grp: description: Input fileGrp@USE this tool expects by default type: array - default: ['PLACEHOLDER'] - # Naming convention is obsolete - #items: - # type: string + items: + type: string + # Naming convention is obsolete + # pattern: '^OCR-D-[A-Z0-9-]+$' + default: ['INPUT'] # pattern: '^OCR-D-[A-Z0-9-]+$' output_file_grp: description: Output fileGrp@USE this tool produces by default From 48eafc7071e9fbfc56357c33406060a8d32cb6d3 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 27 Jul 2020 12:31:05 +0200 Subject: [PATCH 3/5] Update ocrd_tool.schema.yml Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> --- ocrd_tool.schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_tool.schema.yml b/ocrd_tool.schema.yml index 38f41b1..0d53386 100644 --- a/ocrd_tool.schema.yml +++ b/ocrd_tool.schema.yml @@ -38,7 +38,7 @@ properties: description: The name of the CLI executable in $PATH type: string input_file_grp: - description: Input fileGrp@USE this tool expects by default + description: Input fileGrp@USE examples for this tool type: array items: type: string From f613fc13d8e38a0c4e96e633b59b8a585018aa6b Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 27 Jul 2020 12:31:13 +0200 Subject: [PATCH 4/5] Update ocrd_tool.schema.yml Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> --- ocrd_tool.schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_tool.schema.yml b/ocrd_tool.schema.yml index 0d53386..5dfb671 100644 --- a/ocrd_tool.schema.yml +++ b/ocrd_tool.schema.yml @@ -47,7 +47,7 @@ properties: default: ['INPUT'] # pattern: '^OCR-D-[A-Z0-9-]+$' output_file_grp: - description: Output fileGrp@USE this tool produces by default + description: Output fileGrp@USE examples for this tool type: array # Naming convention is obsolete #items: From eaa4b5d7b193457ff0cf766fb38f9fd4e0f6501b Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Mon, 27 Jul 2020 12:31:35 +0200 Subject: [PATCH 5/5] Update ocrd_tool.schema.yml Co-authored-by: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> --- ocrd_tool.schema.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ocrd_tool.schema.yml b/ocrd_tool.schema.yml index 5dfb671..4413425 100644 --- a/ocrd_tool.schema.yml +++ b/ocrd_tool.schema.yml @@ -49,10 +49,11 @@ properties: output_file_grp: description: Output fileGrp@USE examples for this tool type: array + items: + type: string # Naming convention is obsolete - #items: - # type: string # pattern: '^OCR-D-[A-Z0-9-]+$' + default: ['OUTPUT'] parameters: description: Object describing the parameters of a tool. Keys are parameter names, values sub-schemas. type: object