fix of determining ADE database objects in graph

3dcitydb · Apr 17, 2019 · b4cde22 · b4cde22
1 parent 424290b
commit b4cde22
Show file tree

Hide file tree

Showing 3 changed files with 2,123 additions and 1,979 deletions.
diff --git a/src/main/java/org/citydb/plugins/ade_manager/transformation/database/DBScriptGenerator.java b/src/main/java/org/citydb/plugins/ade_manager/transformation/database/DBScriptGenerator.java
@@ -340,7 +340,8 @@ private void shrotenDatabaseObjectName() {
 					String originalDatabaseObjectName = (String) attr.getValueAt("name");
 					String shortenedName = null;
 					if (nodeTypeName.equalsIgnoreCase(GraphNodeArcType.DataTable) || nodeTypeName.equalsIgnoreCase(GraphNodeArcType.JoinTable)) {												
-						if (!ADEschemaHelper.CityDB_Tables.containsValue(originalDatabaseObjectName)) {
+						boolean isADETable = (boolean) attr.getValueAt("isADE");
+						if (isADETable) {
 							shortenedName = NameShortener.shortenDbObjectName(originalDatabaseObjectName, maxTableNameLengthWithPrefix);
 							shortenedName = prefix + "_" + shortenedName;		
 							shortenedName = this.processDuplicatedDbName(dbTableNameList, shortenedName, GlobalConstants.MAX_TABLE_NAME_LENGTH, 0);

diff --git a/src/main/java/org/citydb/plugins/ade_manager/transformation/graph/GraphCreator.java b/src/main/java/org/citydb/plugins/ade_manager/transformation/graph/GraphCreator.java
@@ -597,7 +597,9 @@ private void createTableForCityGMLClass(String citygmlNamespaceUri, String class
 
 		ValueMember attr1 = (ValueMember) valueTuple.getValueMemberAt("name");
 		attr1.setExprAsObject(ADEschemaHelper.CityDB_Tables.get(new QName(citygmlNamespaceUri, className)));
-
+		ValueMember attr2 = (ValueMember) valueTuple.getValueMemberAt("isADE");
+		attr2.setExprAsObject(false);
+
 		// create a primary key column linking with the class table
 		Node pkColumnNode = this.createNode(GraphNodeArcType.PrimaryKeyColumn);
 		this.createArc(GraphNodeArcType.BelongsTo, pkColumnNode, tableNode);