Added graph.tg hash caching to FixExportedOntology

[simantics/platform.git] / bundles / org.simantics.graph / src / org / simantics / graph / refactoring / FixExportedOntology.java

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java b/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
index bf0224103228a0838952cf553b9fea9b54d14ed6..ffe174eb943b236be72e4d1a8f26808070828608 100644 (file)
--- a/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/refactoring/FixExportedOntology.java
@@ -1,17 +1,17 @@
 package org.simantics.graph.refactoring;
 
 import java.io.BufferedInputStream;
-import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 
 import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.databoard.container.DataContainer;
 import org.simantics.databoard.container.DataContainers;
+import org.simantics.graph.representation.PrettyPrintTG;
 import org.simantics.graph.representation.TransferableGraph1;
 
 /**
@@ -20,29 +20,47 @@ import org.simantics.graph.representation.TransferableGraph1;
  */
 public class FixExportedOntology {
        
-       static void convertExportedSharedOntologyIntoBundleOntology(Path input, Path output) throws Exception {
+       static TransferableGraph1 convertExportedSharedOntologyIntoBundleOntology(Path input, Path output) throws Exception {
                System.out.format("Converting exported shared ontology%n\t" + input.toString() + "%nto bundle-compatible ontology%n\t" + output.toString());
                try (InputStream is = new BufferedInputStream(Files.newInputStream(input), 128*1024)) {
-                       DataInput dis = new DataInputStream(is);
-                       org.simantics.databoard.container.DataContainer container = 
-                                       DataContainers.readFile(dis); 
-                       Binding binding = TransferableGraph1.BINDING;
-                       TransferableGraph1 graph = (TransferableGraph1)container.content.getValue(binding);
+                       Binding tgBinding = TransferableGraph1.BINDING;
+                       DataContainer container = DataContainers.readFile(new DataInputStream(is), tgBinding); 
+                       TransferableGraph1 graph = (TransferableGraph1) container.content.getValue(tgBinding);
+
                        GraphRefactoringUtils.fixOntologyExport(graph);
+                       container = TransferableGraphHasher.addHashToTG(container, graph);
 
-                       DataContainers.writeFile(output.toFile(), new DataContainer(
-                                       container.format, container.version,
-                                       container.metadata, new Variant(TransferableGraph1.BINDING, graph)));
+                       DataContainers.writeFile(output.toFile(), container);
+                       return graph;
                }
        }
+       
+       public static void createTg(Path input) throws Exception {
+           Path output = input.getParent().resolve("graph.tg");
+           createTg(input, output);
+       }
+       
+       private static void createTg(Path input, Path output) throws Exception {
+           convertExportedSharedOntologyIntoBundleOntology(input, output);
+       }
+       
+       public static void createTGAndPGraph(Path input) throws Exception {
+        Path output1 = input.getParent().resolve("graph.tg");
+        TransferableGraph1 tg = convertExportedSharedOntologyIntoBundleOntology(input, output1);
+        String listing = PrettyPrintTG.print(tg, false);
+        String newName = input.getFileName().toString();
+        if (newName.contains("."))
+            newName = newName.split("\\.")[0];
+        Path output2 = input.getParent().resolve(newName + ".pgraph");
+        Files.write(output2, listing.getBytes(),StandardOpenOption.CREATE);
+       }
 
        public static void main(String[] args) throws Exception {
-               if (args.length < 1) {
-                       System.out.println("Required arguments: <input .sharedOntology file> [<output .tg file>]");
-               } else if (args.length < 2) {
+               if (args.length == 0) {
+                       System.out.println("Required arguments: <input .sharedLibrary file> [<output .tg file>]");
+               } else if (args.length == 1) {
                        Path input = Paths.get(args[0]);
-                       Path output = input.getParent().resolve(input.getName(input.getNameCount()-1) + ".fixed");
-                       convertExportedSharedOntologyIntoBundleOntology(input, output);
+                       createTGAndPGraph(input);
                } else {
                        convertExportedSharedOntologyIntoBundleOntology(Paths.get(args[0]), Paths.get(args[1]));
                }