Backlink should be full URL and not just filename (LanguageMachines/P…

…ICCL#51)

clam/clamdispatcher.py

@@ -25,7 +25,7 @@
 import signal
 import shutil
 
-VERSION = '2.4.9'
+VERSION = '2.4.10'
 
 sys.path.append(sys.path[0] + '/..')
 

clam/common/data.py

@@ -37,7 +37,7 @@
 import clam.common.util
 import clam.common.viewers
 
-VERSION = '2.4.8'
+VERSION = '2.4.10'
 
 #dirs for services shipped with CLAM itself
 CONFIGDIR = os.path.abspath(os.path.dirname(__file__) + '/../config/')
@@ -2347,7 +2347,7 @@ def __init__(self, id, name, url, description="", type='zip'):
     def __call__(self, project, baseurl, outputfile=None):
         """Return the forward link given a project and (optionally) an outputfile. If no outputfile was selected, a link is generator to download the entire output archive."""
         if outputfile:
-            self.forwardlink = self.url.replace("$BACKLINK", outputfile.filename)
+            self.forwardlink = self.url.replace("$BACKLINK", str(outputfile))
         else:
             self.forwardlink =  self.url.replace("$BACKLINK", baseurl + '/' + project + '/output/' + self.type)
         return self

codemeta.json

@@ -10,7 +10,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "clam",
     "name": "CLAM",
-    "version": "2.4.9",
+    "version": "2.4.10",
     "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",

setup.py

@@ -13,7 +13,7 @@ def read(fname):
 
 setup(
     name = "CLAM",
-    version = "2.4.9", #also change in clam.common.data.VERSION and dispatcher.py and codemeta.json
+    version = "2.4.10", #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 NLP tools into fully-fledged RESTful webservices with an auto-generated web-interface for human end-users."),