Fixed invalid json

opensourceBIM · Jan 24, 2017 · aff78aa · aff78aa
1 parent dcf9678
commit aff78aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/BimServer/src/org/bimserver/database/queries/json/validifc.json b/BimServer/src/org/bimserver/database/queries/json/validifc.json
@@ -73,20 +73,15 @@
       "IfcConversionBasedUnit": {
          "type": "IfcConversionBasedUnit"
       },
-      "IfcDerivedUnitElement": [
-         {
-            "type": "IfcDerivedUnitElement",
-            "field": "Unit",
-            "includes": [
-               "IfcContextDependentUnit",
-               "IfcConversionBasedUnit",
-               "IfcSIUnit"
-            ]
-         },
-         {
-            "type": "IfcDerivedUnitElement"
-         }
-      ],
+      "IfcDerivedUnitElement": {
+        "type": "IfcDerivedUnitElement",
+        "field": "Unit",
+        "includes": [
+           "IfcContextDependentUnit",
+           "IfcConversionBasedUnit",
+           "IfcSIUnit"
+        ]
+      },
       "Dimensions": {
          "type": "IfcConversionBasedUnit",
          "field": "Dimensions",

diff --git a/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java b/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
@@ -169,7 +169,7 @@ private void parseDefines(Query query, ObjectNode jsonNode) throws QueryExceptio
 				Include include = new Include(packageMetaData);
 				query.addDefine(fieldName, include);
 			} else {
-				throw new QueryException("\"defines\"[" + i + "] must be of type object");
+				throw new QueryException("\"defines\"[" + fieldName + "] must be of type object");
 			}
 			i++;
 		}