Parsing of specific packed workflows using %23 as hash

Author: MarkRobbo

src/main/java/org/commonwl/view/cwl/CWLService.java

@@ -171,10 +171,15 @@ public Workflow parseWorkflowNative(File workflowFile, String packedWorkflowId)
 
             if (packedWorkflowId != null) {
                 for (JsonNode jsonNode : cwlFile.get(DOC_GRAPH)) {
-                    if (extractProcess(jsonNode) == CWLProcess.WORKFLOW &&
-                            jsonNode.get(ID).asText().equals(packedWorkflowId)) {
-                        cwlFile = jsonNode;
-                        break;
+                    if (extractProcess(jsonNode) == CWLProcess.WORKFLOW) {
+                        String currentId = jsonNode.get(ID).asText();
+                        if (currentId.startsWith("#")) {
+                            currentId = currentId.substring(1);
+                        }
+                        if (currentId.equals(packedWorkflowId)) {
+                            cwlFile = jsonNode;
+                            break;
+                        }
                     }
                 }
             }

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

@@ -333,7 +333,6 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
                 if (!cwlService.isPacked(workflowFile)) {
                     throw new WorkflowNotFoundException();
                 }
-
             }
 
             Workflow basicModel = cwlService.parseWorkflowNative(workflowFile, packedWorkflowId);