From 0ff32a2ff930016c8fde86adbff97c0eab5d0c6f Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 14 Jan 2022 12:45:10 +0100 Subject: [PATCH] Import bricht wegen IFCTEXT($) ab http://bitnami/issues/5523 --- .../de/weiltweitbau/deserializers/IfcParserWriterUtils.java | 4 ++++ .../src/org/bimserver/database/actions/GetPluginBundle.java | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BimServer/src/de/weiltweitbau/deserializers/IfcParserWriterUtils.java b/BimServer/src/de/weiltweitbau/deserializers/IfcParserWriterUtils.java index eb3be266ba..2455674a04 100644 --- a/BimServer/src/de/weiltweitbau/deserializers/IfcParserWriterUtils.java +++ b/BimServer/src/de/weiltweitbau/deserializers/IfcParserWriterUtils.java @@ -158,6 +158,10 @@ private static Object getDefaultValue(EStructuralFeature eStructuralFeature, Cla * @throws DeserializeException */ public static String readString(String value, long lineNumber) throws DeserializeException { + if(value.equals("$")) { + return ""; + } + String result = value.substring(1, value.length() - 1); // Replace all '' with ' while (result.contains("''")) { diff --git a/BimServer/src/org/bimserver/database/actions/GetPluginBundle.java b/BimServer/src/org/bimserver/database/actions/GetPluginBundle.java index d92dccb3f8..d09666cff7 100644 --- a/BimServer/src/org/bimserver/database/actions/GetPluginBundle.java +++ b/BimServer/src/org/bimserver/database/actions/GetPluginBundle.java @@ -50,11 +50,7 @@ public GetPluginBundle(DatabaseSession databaseSession, AccessMethod accessMetho @Override public SPluginBundle execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException, ServerException { - if (bimServer.getVersionChecker() != null && bimServer.getVersionChecker().getLocalVersion() != null) { - bimserverVersion = new DefaultArtifactVersion(bimServer.getVersionChecker().getLocalVersion().getFullString()); - } else { - LOGGER.info("No BIMserver version"); - } + bimserverVersion = new DefaultArtifactVersion("1.5.182"); MavenPluginLocation pluginLocation = bimServer.getMavenPluginRepository().getPluginLocation(repository, groupId, artifactId);