small fixes in data insertion tasks

SemanticBMSClient/edit.html

@@ -135,12 +135,13 @@
 		},
 		
 		initBatchCommon : function() {
+			$("#delimiter").selectpicker();
 			$("#parseBatch").click(
 					function() {
 						$("#rawInput").attr("rows", 6);
 						p.parseRawInput($("#rawInput").val(), $(
-								"#headers").prop("checked"), $(
-								"#delimiter").val());
+								"#headers").prop("checked"), 
+								$("#delimiter").val());
 			});
 			
 			p.loadList(p.fieldsType, function(data, params) {
@@ -164,7 +165,9 @@
 		
 		parseRawInput : function(input, headersPresent, delimiter) {
 			var data;
-
+			if (delimiter == "TAB") {
+				delimiter = "\t";
+			}
 			if (headersPresent) {
 				// custom headers ordering
 				var headers = [];

SemanticBMSClient/inclInsertBatch.html

@@ -15,7 +15,7 @@
      <div class="col-lg-2">
      <div class="checkbox"><label><input type="checkbox" value="" id="headers">The first row contains headers</label></div>
        <div class="form-group">
-        <label for="delimiter">Delimiter:</label><select id="delimiter" class="selectpicker btn-sm"><option value=";" selected>Semicolon (;)</option><option value=",">Comma (,)</option><option value="\t">TAB</option></select>
+        <label for="delimiter">Delimiter:</label><select id="delimiter" class="selectpicker btn-sm"><option value=";" selected>Semicolon (;)</option><option value=",">Comma (,)</option><option value="TAB">TAB</option></select>
         </div> 
          <div class="form-group">
        <button type="button" id="parseBatch" class="btn btn-info">Parse data</button>

SemanticBMSServer/src/main/java/cz/muni/fi/lasaris/sbms/api/entities/Trend.java

@@ -2,6 +2,7 @@ package cz.muni.fi.lasaris.sbms.api.entities;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 @XmlRootElement
@@ -10,7 +11,7 @@ public class Trend extends Address implements Groupable {
 	
 	private DataPoint dataPoint;
 	
-	
+	@JsonIgnore
 	@Override
 	public String getGroup() {
 		return (dataPoint == null) ? null : dataPoint.getGroup();

SemanticBMSServer/src/main/java/cz/muni/fi/lasaris/sbms/api/response/TypeResponse.java

 package cz.muni.fi.lasaris.sbms.api.response;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -23,6 +24,11 @@ public class TypeResponse {
 	public List<String> getMembers() {
 		return members;
 	}
+	
+	public String toString() {
+		return name + ": " + Arrays.toString(members.toArray()); 
+	}
+	
 	public void setMembers(List<String> members) {
 		this.members = members;
 	}

SemanticBMSServer/src/main/java/cz/muni/fi/lasaris/sbms/model/ModelUpdater.java

@@ -41,7 +41,8 @@ public class ModelUpdater {
 			if(!dp.hasProperty(RDF.type)) {
 				if(!TypesProvider.getDataPointTypes().getMembers().contains(d.getType())) {
 					//throw new IllegalArgumentException("Unknown datapoint type");
-					return failInsert("Unknown datapoint type");
+					return failInsert("Unknown datapoint type [" + d.getType() + "]. Allowed types for " 
+					+ TypesProvider.getDataPointTypes().toString());
 				}
 				logger.debug("Inserting dp type: " + d.getType());
 				dp.addProperty(RDF.type, m.createResource(NS.sbms + d.getType()));
@@ -80,11 +81,13 @@ public class ModelUpdater {
 					&& d.getScope() != null && d.getScope().getBimId() != null) {
 				if(!TypesProvider.getQualityTypes().getMembers().contains(d.getProperty().getQuality())) {
 					//throw new IllegalArgumentException("Unknown quality type");
-					return failInsert("Unknown quality type");
+					return failInsert("Unknown quality type [" + d.getProperty().getQuality() + "]. Allowed types for " 
+					+ TypesProvider.getQualityTypes().toString());
 				}
 				if(!TypesProvider.getPropDomainTypes().getMembers().contains(d.getProperty().getDomain())) {
 					//throw new IllegalArgumentException("Unknown property type");
-					return failInsert("Unknown property domain type");
+					return failInsert("Unknown property domain type [" + d.getProperty().getDomain() + "]. Allowed types for " 
+					+ TypesProvider.getPropDomainTypes().toString());
 				}
 				
 				logger.debug("Inserting observed property: " + d.getProperty());
@@ -137,7 +140,8 @@ public class ModelUpdater {
 			if(d.getSensing() != null && d.getSensing().getType() != null) {
 				if(!TypesProvider.getSensingTypes("all").getMembers().contains(d.getSensing().getType())) {
 					//throw new IllegalArgumentException("Unknown sensing type");
-					return failInsert("Unknown sensing type");
+					return failInsert("Unknown sensing type [" + d.getSensing().getType() + "]. Allowed types for " 
+					+ TypesProvider.getSensingTypes("all").toString());
 				}
 				logger.debug("Inserting sensing: " + d.getSensing());
 				Resource sensing = m.createResource(NS.sbmsd + d.getResourceId() + "Sensing");
@@ -157,7 +161,8 @@ public class ModelUpdater {
 				if(d.getSensing() != null && d.getSensing().getWindow() != null) {
 					if(!TypesProvider.getTimeWindowTypes().getMembers().contains(d.getSensing().getWindow())) {
 						//throw new IllegalArgumentException("Unknown time window type");
-						return failInsert("Unknown time window type");
+						return failInsert("Unknown time window type [" + d.getSensing().getWindow() + "]. Allowed types for " 
+					+ TypesProvider.getTimeWindowTypes().toString());
 					}
 					if(!TypesProvider.getStatefulSensingTypes().getMembers().contains(d.getSensing().getType())) {
 						//throw new IllegalArgumentException("No time window for this sensing type");
@@ -553,7 +558,7 @@ public class ModelUpdater {
 	private static boolean checkBIMId(String bimId) {
 		logger.debug("Checking bimId: " + bimId);
 		if( TdbConnector.executeSPARQLList(
-				String.format("SELECT * { ?object <%shasBIMId> \"%s\"}", NS.sbim, bimId)).size() > 0) {
+				String.format("SELECT * { ?object <%shasBIMId> \"%s\"}", NS.sbim, bimId), true).size() > 0) {
 			logger.debug("Check succeeded");
 			return true;
 		} else {