From 5b362708899c371869473ec2e1cb94fac9b31634 Mon Sep 17 00:00:00 2001
From: andreas <andreas.baumann@wwbau.de>
Date: Tue, 18 Apr 2023 15:58:54 +0200
Subject: [PATCH] Werte vom BIMServer mit korrektem Datentyp holen
 http://bitnami/issues/7138

---
 Bdb/pom.xml                                   |  2 +-
 BimServer/pom.xml                             |  2 +-
 .../queries/DatabaseReadingStackFrame.java    |  4 ++-
 BimServerClientLib/pom.xml                    |  2 +-
 BimServerJar/pom.xml                          |  2 +-
 .../org.eclipse.wst.common.component          | 32 ++++++++++++-------
 BimServerWar/pom.xml                          |  2 +-
 PluginBase/pom.xml                            |  2 +-
 Shared/pom.xml                                |  2 +-
 Tests/pom.xml                                 |  2 +-
 pom.xml                                       |  2 +-
 11 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Bdb/pom.xml b/Bdb/pom.xml
index 9a6dbc788e..bbca82fb57 100644
--- a/Bdb/pom.xml
+++ b/Bdb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Bdb</name>
diff --git a/BimServer/pom.xml b/BimServer/pom.xml
index c34081e84f..d7f4ec70e5 100644
--- a/BimServer/pom.xml
+++ b/BimServer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/BimServer/src/org/bimserver/database/queries/DatabaseReadingStackFrame.java b/BimServer/src/org/bimserver/database/queries/DatabaseReadingStackFrame.java
index cf7beedf00..e1960cbdc6 100644
--- a/BimServer/src/org/bimserver/database/queries/DatabaseReadingStackFrame.java
+++ b/BimServer/src/org/bimserver/database/queries/DatabaseReadingStackFrame.java
@@ -693,9 +693,11 @@ private void includePropertySingleValue(HashMapVirtualObject property, String pr
 		}
 
 		Object wrappedValue = value.eGet(value.eClass().getEStructuralFeature("wrappedValue"));
-		if (value.eClass().getName().equals("IfcBoolean")) {
+		if (matchesType(value.eClass(), "IfcBoolean")) {
 			Enumerator tristate = (Enumerator) wrappedValue;
 			includedProperties.put(name, tristate.getName().toLowerCase());
+		} else if(wrappedValue instanceof Number || wrappedValue instanceof Boolean) {
+			includedProperties.put(name, wrappedValue);
 		} else {
 			includedProperties.put(name, wrappedValue.toString());
 		}
diff --git a/BimServerClientLib/pom.xml b/BimServerClientLib/pom.xml
index d753bbf865..4aebdc020d 100644
--- a/BimServerClientLib/pom.xml
+++ b/BimServerClientLib/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<properties>
 		<cxf.version>3.3.2</cxf.version>
diff --git a/BimServerJar/pom.xml b/BimServerJar/pom.xml
index 3400ec632b..6785f5bba1 100644
--- a/BimServerJar/pom.xml
+++ b/BimServerJar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/BimServerWar/.settings/org.eclipse.wst.common.component b/BimServerWar/.settings/org.eclipse.wst.common.component
index 70ffa99153..052ff97a52 100644
--- a/BimServerWar/.settings/org.eclipse.wst.common.component
+++ b/BimServerWar/.settings/org.eclipse.wst.common.component
@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-        
-    <wb-module deploy-name="bimserverwar-1.5.182">
-        <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/web.xml"/>
+            
+    
+    <wb-module deploy-name="bimserverwar-1.3.0">
                 
+        <wb-resource deploy-path="/WEB-INF/web.xml" source-path="/web.xml"/>
+                        
+        
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                
+                        
+        
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <dependent-module archiveName="bimserver-1.5.182.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServer/BimServer">
+        <dependent-module archiveName="bimserver-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServer/BimServer">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="bimserverclientlib-1.5.182.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServerClientLib/BimServerClientLib">
+        <dependent-module archiveName="bimserverclientlib-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/BimServerClientLib/BimServerClientLib">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="shared-1.5.182.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Shared/Shared">
+        <dependent-module archiveName="shared-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Shared/Shared">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="pluginbase-1.5.182.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/PluginBase/PluginBase">
+        <dependent-module archiveName="pluginbase-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/PluginBase/PluginBase">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                
+                        
+        
         <property name="java-output-path" value="/BimServerWar/target/classes"/>
-                
+                        
+        
         <property name="context-root" value="bimserverwar"/>
-            
-    </wb-module>
+                    
     
+    </wb-module>
+        
+
 </project-modules>
diff --git a/BimServerWar/pom.xml b/BimServerWar/pom.xml
index e33b4629c4..c26006f2b3 100644
--- a/BimServerWar/pom.xml
+++ b/BimServerWar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/PluginBase/pom.xml b/PluginBase/pom.xml
index 7732568847..4845d5a4c5 100644
--- a/PluginBase/pom.xml
+++ b/PluginBase/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/Shared/pom.xml b/Shared/pom.xml
index 33edb80667..6497420058 100644
--- a/Shared/pom.xml
+++ b/Shared/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/Tests/pom.xml b/Tests/pom.xml
index 128c5a333d..06ab641172 100644
--- a/Tests/pom.xml
+++ b/Tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.weltweitbau</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/pom.xml b/pom.xml
index 1e132d26e3..5b7cd53e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.weltweitbau</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
 	<packaging>pom</packaging>
 	<description>This is the parent pom, no idea why this is being released</description>
 	<properties>