Testing prebuilts

opensourceBIM · Mar 15, 2018 · 3ca5b56 · 3ca5b56
1 parent c364b28
commit 3ca5b56
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/BimServer/.gitignore b/BimServer/.gitignore
@@ -4,3 +4,4 @@
 /home1
 /home2
 /target/
+/pre/
diff --git a/BimServer/src/org/bimserver/webservices/impl/PluginServiceImpl.java b/BimServer/src/org/bimserver/webservices/impl/PluginServiceImpl.java
@@ -1624,7 +1624,7 @@ public List<SInternalServicePluginConfiguration> getAllInternalServicesOfService
 	@Override
 	public Boolean hasPreBuiltPlugins() throws UserException {
 		try {
-			Path file = getBimServer().getResourceFetcher().getFile("/pre");
+			Path file = getBimServer().getResourceFetcher().getFile("pre");
 			if (file != null) {
 				return Files.isDirectory(file);
 			} else {

diff --git a/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java b/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java
@@ -2016,7 +2016,7 @@ public List<SExtendedDataSchema> getAllRepositoryExtendedDataSchemas(Boolean use
 		if (usePre) {
 			try {
 				Path file = getBimServer().getResourceFetcher().getFile("pre/extendeddataschemas.json");
-				if (Files.exists(file)) {
+				if (file != null && Files.exists(file)) {
 					content = new String(Files.readAllBytes(file), Charsets.UTF_8);
 				}
 			} catch (IOException e) {

diff --git a/BimServer/www/setup.html b/BimServer/www/setup.html
@@ -540,10 +540,13 @@ <h4 class="media-heading">Console</h4>
 				if (prebuilt) {
 					debugger;
 					var artifacts = [];
-					for (var key in requiredPlugin) {
-						artifacts.push(requiredPlugin[key].artifactId);
+					for (var key in requiredPlugins) {
+						artifacts.push(requiredPlugins[key].artifactId);
 					}
-					Global.api.call("PluginInterface", "installPreBuiltPlugins", artifacts);
+					console.log(artifacts);
+					Global.api.call("PluginInterface", "installPreBuiltPlugins", {
+						artifacts: artifacts
+					});
 				} else {
 					Global.api.call("PluginInterface", "getInstalledPluginBundles", {}, function(bundles){
 						bundles.forEach(function(bundle){