From afffdeb993500a6abdb6fe85a549e3d6e97e9ee7 Mon Sep 17 00:00:00 2001
From: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu, 23 Jun 2022 16:39:22 +0200
Subject: [PATCH] operations section in config cleaned up

---
 config.yaml                          | 19 ++++++++++---------
 test/integration_tests/serve_test.py |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config.yaml b/config.yaml
index 067df8d..eb37902 100755
--- a/config.yaml
+++ b/config.yaml
@@ -9,34 +9,35 @@ service:
   # specified in the request
   download_strategy: $DOWNLOAD_STRATEGY|multi
   response_formatter: default  # TODO: write formatter for analysis tasks that pulls metadata content into root of response json
+  # Note: This is not really the right place for this. It should be configured on a per-service basis.
   operations:
     conversion:
       input:
         subdir: ""
         extension: ORIGIN.pdf.gz
-      output: # FIXME
-        subdir: "conversion_new"  # FIXME: currently operation string is sued for output dir
+      output:
+        subdir: "conversion"
         extension: json.gz
     extraction:
       input:
         subdir: ""
         extension: ORIGIN.pdf.gz
-      output: # FIXME
-        subdir: "extraction_new"  # FIXME: currently operation string is sued for output dir
+      output:
+        subdir: "extraction"
         extension: json.gz
     table_parsing:
       input:
-        subdir: "conversion_new"
+        subdir: "conversion"
         extension: json.gz
-      output: # FIXME
-        subdir: "table_new"  # FIXME: currently operation string is sued for output dir
+      output:
+        subdir: "table_new"
         extension: json.gz
     default:
       input:
         subdir: ""
         extension: IN.gz
-      output: # FIXME
-        subdir: ""  # FIXME: currently operation string is sued for output dir
+      output:
+        subdir: ""
         extension: out.gz
 
 probing_webserver:
diff --git a/test/integration_tests/serve_test.py b/test/integration_tests/serve_test.py
index 99e95ec..ccbe279 100644
--- a/test/integration_tests/serve_test.py
+++ b/test/integration_tests/serve_test.py
@@ -160,7 +160,7 @@ def build_filepath(object_descriptor, page):
     object_name = object_descriptor["object_name"]
     parts = object_name.split("/")
     path = "/".join(parts)
-    path = re.sub("id:\d", f"id:{page}", path)
+    path = re.sub(r"id:\d", f"id:{page}", path)
 
     return path