X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics%2Fsrc%2Forg%2Fsimantics%2FSimanticsPlatform.java;h=faee6944da3a356496cdbbc0f40ff710175e917f;hb=e3944c748c450a0760b9525e53e36b96180103b4;hp=11013eaf7e32ffd1f09fbc4477ed074c2dad21e7;hpb=d70b5f7a4cdeea05c7526560303feffeb03596b0;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
index 11013eaf7..faee6944d 100644
--- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
@@ -19,6 +19,8 @@ import static org.simantics.db.common.utils.Transaction.writeGraph;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -39,6 +41,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.ini4j.Ini;
+import org.ini4j.InvalidFileFormatException;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.Databoard;
 import org.simantics.datatypes.literal.Font;
@@ -79,6 +83,7 @@ import org.simantics.graph.db.GraphDependencyAnalyzer;
 import org.simantics.graph.db.GraphDependencyAnalyzer.IU;
 import org.simantics.graph.db.GraphDependencyAnalyzer.IdentityNode;
 import org.simantics.graph.db.IImportAdvisor;
+import org.simantics.graph.db.ImportResult;
 import org.simantics.graph.db.TransferableGraphs;
 import org.simantics.graph.diff.Diff;
 import org.simantics.graph.diff.TransferableGraphDelta1;
@@ -103,6 +108,7 @@ import org.simantics.project.management.WorkspaceUtil;
 import org.simantics.utils.FileUtils;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.logging.TimeLogger;
+import org.simantics.utils.strings.EString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -155,6 +161,9 @@ public class SimanticsPlatform implements LifecycleListener {
     /** Set to true when the Simantics Platform is in good-and-go condition */
     public boolean running;
 
+    /** ID of the database driver that the platform is currently using */
+    private String currentDatabaseDriver;
+
     /** Database Session */
     public Session session;
     private Management databasebManagement;
@@ -204,24 +213,31 @@ public class SimanticsPlatform implements LifecycleListener {
     private Session setupDatabase(String databaseDriverId, IProgressMonitor progressMonitor, RecoveryPolicy workspacePolicy, PlatformUserAgent userAgent) throws PlatformException {
         if (progressMonitor == null)
             progressMonitor = new NullProgressMonitor();
-        File dbLocation = Platform.getLocation().append("db").toFile();
+        Path workspaceLocation = Platform.getLocation().toFile().toPath();
+        Path dbLocation = workspaceLocation.resolve("db");
+        Path dbIniPath = workspaceLocation.resolve("db.ini");
+        // The driver file overrides any command line arguments to prevent
+        // using the wrong driver for an existing database directory.
         ServerManager serverManager;
         try {
-            serverManager = ServerManagerFactory.create(databaseDriverId, dbLocation.getAbsolutePath());
+            Ini dbIni = loadOrCreateDatabaseIni(dbIniPath, databaseDriverId);
+            databaseDriverId = dbIni.get("driver", "id");
+            serverManager = ServerManagerFactory.create(databaseDriverId, dbLocation.toAbsolutePath().toString());
         } catch (DatabaseException | IOException e) {
-            throw new PlatformException("Failed to initialize Server Manager", e);
+            throw new PlatformException("Failed to initialize database ServerManager with driver " + databaseDriverId, e);
         }
         progressMonitor.beginTask("Setting up Simantics Database", 100);
         progressMonitor.setTaskName("Asserting Database is installed.");
         String msg = "Failed to initialize Simantics database.";
         try {
             // Create database
-            log.log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Creating database at " + dbLocation));
+            log.log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Initializing database at " + dbLocation + " with driver " + databaseDriverId));
             progressMonitor.setTaskName("Creating database at " + dbLocation);
-            databasebManagement = serverManager.getManagement(dbLocation);
+            databasebManagement = serverManager.getManagement(dbLocation.toFile());
             databasebManagement.create();
+            currentDatabaseDriver = databaseDriverId;
             // Create layer0.
-            return serverManager.createDatabase(dbLocation);
+            return serverManager.createDatabase(dbLocation.toFile());
         } catch (DatabaseException e) {
             throw new PlatformException(msg, e);
         } catch (Throwable e) {
@@ -387,15 +403,22 @@ public class SimanticsPlatform implements LifecycleListener {
                         	final IImportAdvisor advisor = new OntologyImportAdvisor(tg, mgmt);
                         	final GraphBundle oldTG = reinstallTGs.get(tg);
 
+                        	boolean createImmutable = tg.getImmutable();
+
                         	if (oldTG==null) {
-                        		
-                        		boolean createImmutable = tg.getImmutable();
+
                                 session.getService(XSupport.class).setServiceMode(true, createImmutable);
 
                         		// Install TG
                         		log.log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Installing "+tg.toString()+" - "+tg.getName()));
-                        		TransferableGraphs.importGraph1(session, new TGTransferableGraphSource(tg.getGraph()), advisor, null);
+                        		ImportResult result = TransferableGraphs.importGraph1(session, new TGTransferableGraphSource(tg.getGraph()), advisor, null);
+                        		if (!result.missingExternals.isEmpty()) {
+                        			log.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Import of " + tg.toString() + " was missing the following external entities:\n" + EString.implode(result.missingExternals)));
+                        		}
                         	} else {
+                        		if(!createImmutable)
+                        			continue;
+
                         		// Merge TG
                         		startTransaction(session, false);
                         		TransferableGraphDelta1 delta = new Diff(oldTG.getGraph(), tg.getGraph()).diff();
@@ -970,6 +993,7 @@ public class SimanticsPlatform implements LifecycleListener {
 
             session = null;
             projectResource = null;
+            currentDatabaseDriver = null;
 
             DependenciesRelation.assertFinishedTracking();
 
@@ -1032,6 +1056,8 @@ public class SimanticsPlatform implements LifecycleListener {
 
     public void reconnect(String databaseDriverId) throws Exception {
         // Starts database server.
+        if (currentDatabaseDriver != null)
+            databaseDriverId = currentDatabaseDriver;
         SimanticsPlatform.INSTANCE.startUp(databaseDriverId, null, RecoveryPolicy.ThrowError, OntologyRecoveryPolicy.ThrowError, true, null);
     }
 
@@ -1043,5 +1069,17 @@ public class SimanticsPlatform implements LifecycleListener {
         }
     }
 
-}
+    private Ini loadOrCreateDatabaseIni(Path path, String databaseDriverId)
+            throws InvalidFileFormatException, IOException
+    {
+        File f = path.toFile();
+        Ini dbIni = Files.isRegularFile(path) ? new Ini(f) : new Ini();
+        String iniId = dbIni != null ? dbIni.get("driver", "id") : null;
+        if (iniId == null) {
+            dbIni.put("driver", "id", databaseDriverId);
+            dbIni.store(f);
+        }
+        return dbIni;
+    }
 
+}