Fix ordering of format parameter in workflow RO ID

Author: MarkRobbo

src/main/java/org/commonwl/view/researchobject/ROBundleService.java

@@ -127,8 +127,8 @@ public Bundle createBundle(Workflow workflow, GitDetails gitInfo) throws IOExcep
             String packedId = workflow.getRetrievedFrom().getPackedId();
             String packedPart = (packedId != null) ? "#" + packedId : "";
             String id = "https://w3id.org/cwl/v/git/" + workflow.getLastCommit() +
-                    "/" + workflow.getRetrievedFrom().getPath() + packedPart;
-            manifest.setId(new URI(id));
+                    "/" + workflow.getRetrievedFrom().getPath();
+            manifest.setId(new URI(id + packedPart));
 
             // Tool attribution in createdBy
             manifest.setCreatedBy(appAgent);
@@ -137,7 +137,7 @@ public Bundle createBundle(Workflow workflow, GitDetails gitInfo) throws IOExcep
             // TODO: Make this importedBy/On/From
             manifest.setRetrievedBy(appAgent);
             manifest.setRetrievedOn(manifest.getCreatedOn());
-            manifest.setRetrievedFrom(new URI(id + "?format=ro"));
+            manifest.setRetrievedFrom(new URI(id + "?format=ro" + packedPart));
 
             // Make a directory in the RO bundle to store the files
             Path bundleRoot = bundle.getRoot();

src/main/java/org/commonwl/view/workflow/WorkflowController.java

@@ -264,8 +264,7 @@ public FileSystemResource downloadGraphSvg(@PathVariable("domain") String domain
         path = extractPath(path, 8);
         GitDetails gitDetails = getGitDetails(domain, owner, repoName, branch, path);
         response.setHeader("Content-Disposition", "inline; filename=\"graph.svg\"");
-        FileSystemResource test = workflowService.getWorkflowGraph("svg", gitDetails);
-        return test;
+        return workflowService.getWorkflowGraph("svg", gitDetails);
     }
 
     /**