fix parameter type bug

Author: hvarg

server/src/main/java/org/diskproject/server/repository/DiskRepository.java

@@ -313,7 +313,7 @@ private void initializeDataAdapters() {
                     System.out.println("Error: Data adapter type not found: '" + curType + "'");
                     break;
             }
-            if (curType != null) {
+            if (curType != null && curAdapter != null) {
                 if (curNamespace != null && curPrefix != null) {
                     curAdapter.setPrefix(curPrefix, curNamespace);
                 }
@@ -1706,9 +1706,10 @@ public Boolean runAllHypotheses(String username) throws Exception {
      * Narratives
      */
 
-    public Map<String, String> getNarratives(String username, String tloid) {
+    public Map<String, String> getNarratives(String username, String tloiId) {
+        // DEPRECATED!
         Map<String, String> narratives = new HashMap<String, String>();
-        TriggeredLOI tloi = this.getTriggeredLOI(username, tloid);
+        TriggeredLOI tloi = this.getTriggeredLOI(username, tloiId);
         if (tloi != null) {
             String hypId = tloi.getParentHypothesisId();
             String loiId = tloi.getParentLoiId();
@@ -1723,14 +1724,15 @@ public Map<String, String> getNarratives(String username, String tloid) {
             // Assuming each tloi only has a workflow or metaworkdflow:
             WorkflowBindings wf = null;
             List<WorkflowBindings> wfs = tloi.getWorkflows();
-            List<WorkflowBindings> mwfs = tloi.getMetaWorkflows();
+            List<WorkflowBindings> metaWfs = tloi.getMetaWorkflows();
 
-            if (mwfs != null && mwfs.size() > 0) {
-                wf = mwfs.get(0);
+            if (metaWfs != null && metaWfs.size() > 0) {
+                wf = metaWfs.get(0);
             } else if (wfs != null && wfs.size() > 0) {
                 wf = wfs.get(0);
             } else {
-                System.out.println("TLOID: " + tloid + " has does not have any workflow.");
+                System.out.println("TLO ID: " + tloiId + " has does not have any workflow.");
+                return null;
             }
 
             // List of data used.

server/src/main/java/org/diskproject/server/repository/WingsAdapter.java

@@ -654,6 +654,8 @@ public String runWorkflow(String wflowname, List<VariableBinding> vbindings, Map
 		formdata.add(new BasicNameValuePair("seed_json", jsonSeed));
 		formdata.add(new BasicNameValuePair("seed_constraints_json", jsonSeedConstraints));
 		String pageid = "users/" + getUsername() + "/" + domain + "/executions/runWorkflow";
+		System.out.println(pageid);
+		System.out.println(formdata);
 		return post(pageid, formdata);
 		//} catch (Exception e) {
 		//	e.printStackTrace();
@@ -835,7 +837,6 @@ public String addRemoteDataToWings(String url, String name, String dType) throws
 		try {
 			HttpGet securedResource = new HttpGet(url);
 			CloseableHttpResponse httpResponse = client.execute(securedResource);
-
 			try {
 				HttpEntity responseEntity = httpResponse.getEntity();
 				ByteArrayOutputStream baos = new ByteArrayOutputStream(); 
@@ -856,6 +857,9 @@ public String addRemoteDataToWings(String url, String name, String dType) throws
 			} catch (IOException e) {
 			}
 		}
+		if (bytes == null) {
+			return null;
+		}
 
 		System.out.println("Content downloaded [" + bytes.length + "] ");
 		String dataid = addDataToWingsAsFile(name, bytes, dType);
@@ -1104,8 +1108,12 @@ private String toPlanAcceptableFormat(String wfname, List<VariableBinding> vbl,
 		// Set Parameter Types
 		String paramTypes = "";
 		for (String key : ivm.keySet()) {
-			if (ivm.get(key).isParam())
-				paramTypes += "\"" + wfname + key + "\":\"" + ivm.get(key).getType() + "\",";
+			Variable var = ivm.get(key);
+			if (var.isParam()) {
+				List<String> types = var.getType();
+				String type = types != null && types.size() > 0 ? types.get(0) : KBConstants.XSD_NS + "string";
+				paramTypes += "\"" + wfname + key + "\":\"" + type + "\",";
+			}
 		}
 		if (paramTypes.length() > 0)
 			paramTypes = paramTypes.substring(0, paramTypes.length() - 1);