fix in JSON-LD output

proycon · Dec 12, 2022 · feb1146 · feb1146
1 parent f64570c
commit feb1146
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/clam/clamdispatcher.py b/clam/clamdispatcher.py
@@ -19,7 +19,7 @@
 import shutil
 import json
 
-VERSION = '3.2.3'
+VERSION = '3.2.4'
 
 sys.path.append(sys.path[0] + '/..')
 

diff --git a/clam/common/data.py b/clam/common/data.py
@@ -38,7 +38,7 @@
 import clam.common.util
 import clam.common.viewers
 
-VERSION = '3.2.3'
+VERSION = '3.2.4'
 
 #dirs for services shipped with CLAM itself
 CONFIGDIR = os.path.abspath(os.path.dirname(__file__) + '/../config/')

diff --git a/clam/templates/response.json b/clam/templates/response.json
@@ -32,6 +32,7 @@
     "url": "{{url}}",
     "consumesData": [
     {% for profile in profiles %}
+    {% set outer_loop = loop %}
     {% for inputtemplate in profile.input %}
     {
         {% if inputtemplate.formatclass.schemaorg_type %}
@@ -54,10 +55,12 @@
     }
     {% if not loop.last %},{% endif %}
     {% endfor %}
+    {% if profile.input and not outer_loop.last %},{% endif %}
     {% endfor %}
     ],
     "producesData": [
     {% for profile in profiles %}
+    {% set outer_loop = loop %}
     {% for outputtemplate in profile.outputtemplates() %}
     {
         {% if outputtemplate.formatclass.schemaorg_type %}
@@ -80,6 +83,7 @@
     }
     {% if not loop.last %},{% endif %}
     {% endfor %}
+    {% if profile.outputtemplates() and not outer_loop.last %},{% endif %}
     {% endfor %}
     ]
 }
diff --git a/codemeta.json b/codemeta.json
@@ -10,7 +10,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "clam",
     "name": "CLAM",
-    "version": "3.2.3",
+    "version": "3.2.4",
     "description": "Quickly turn command-line applications into RESTful webservices with a web-application front-end. You provide a specification of your command line application, its input, output and parameters, and CLAM wraps around your application to form a fully fledged RESTful webservice. ",
     "license": "https://spdx.org/licenses/GPL-3.0",
 	"url": "https://proycon.github.io/clam",

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@ def read(fname):
 
 setup(
     name = "CLAM",
-    version = "3.2.3", #also change in clam.common.data.VERSION and dispatcher.py and codemeta.json
+    version = "3.2.4", #also change in clam.common.data.VERSION and dispatcher.py and codemeta.json
     author = "Maarten van Gompel",
     author_email = "proycon@anaproy.nl",
     description = ("Turns command-line tools into fully-fledged RESTful webservices with an auto-generated web-interface for human end-users."),