fix bug injected by NE-242

derrickoswald · Sep 14, 2017 · 6cccd84 · 6cccd84
1 parent 6837ca0
commit 6cccd84
Show file tree

Hide file tree

Showing 16 changed files with 142 additions and 99 deletions.
diff --git a/CIMConnector/pom.xml b/CIMConnector/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>CIMConnector</artifactId>

diff --git a/CIMEar/pom.xml b/CIMEar/pom.xml
@@ -9,7 +9,7 @@
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
     <artifactId>CIMEar</artifactId>
     <packaging>ear</packaging>

diff --git a/CIMWeb/pom.xml b/CIMWeb/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
     <artifactId>CIMWeb</artifactId>
     <packaging>war</packaging>

diff --git a/CIMWeb/src/main/scala/ch/ninecode/cim/cimweb/Ping.scala b/CIMWeb/src/main/scala/ch/ninecode/cim/cimweb/Ping.scala
@@ -30,9 +30,8 @@ class Ping extends RESTful
         if (try { debug.toBoolean } catch { case _: Throwable => false })
         {
             val environment = Json.createObjectBuilder
-            val env: util.Map[String, String] = System.getenv
-            for (xx <- env)
-                environment.add (xx._1, xx._2)
+            for (pair <- System.getenv)
+                environment.add (pair._1, pair._2)
             val ret = Json.createObjectBuilder
             ret.add ("environment", environment)
             result.setResult (ret.build)

diff --git a/CIMWeb/src/main/webapp/js/cimapp.js b/CIMWeb/src/main/webapp/js/cimapp.js
@@ -213,6 +213,38 @@ define
             xmlhttp.send ();
         }
 
+        /**
+         * @summary Browser independent CORS setup.
+         * @description Creates the CORS request and opens it.
+         * @param {string} method The method type, e.g. "GET" or "POST"
+         * @param {string} url the URL to open the request on
+         * @param {boolean} synchronous optional parameter for open() call, default <em>true</em>
+         * @returns {object} the request object or <code>null</code> if CORS isn't supported
+         * @memberOf module:instancetype
+         */
+        function createCORSRequest (method, url, synchronous)
+        {
+            var ret;
+
+            if ("undefined" == typeof (synchronous))
+                synchronous = true;
+            ret = new XMLHttpRequest ();
+            if ("withCredentials" in ret) // "withCredentials" only exists on XMLHTTPRequest2 objects
+            {
+                ret.open (method, url, synchronous);
+                ret.withCredentials = true;
+            }
+            else if (typeof XDomainRequest != "undefined") // IE
+            {
+                ret = new XDomainRequest ();
+                ret.open (method, url);
+            }
+            else
+                ret = null; // CORS is not supported by the browser
+
+            return (ret);
+        }
+
         /**
          * @summary Connect to the server and read the list of files.
          * @description Invoke the server-side function to list files.
@@ -225,10 +257,14 @@ define
             var url;
             var xmlhttp;
 
-            url = window.location.origin + window.location.pathname + "cim/list/";
-            xmlhttp = new XMLHttpRequest ();
-            xmlhttp.open ("GET", url, true);
-            xmlhttp.setRequestHeader ("Accept", "application/json");
+            if (true)
+                url = window.location.origin + window.location.pathname + "cim/list/";
+            else
+                url = "http://localhost:9080/cimweb/cim/list/data/"
+            // xmlhttp = new XMLHttpRequest ();
+            // xmlhttp.open ("GET", url, true);
+            xmlhttp = createCORSRequest ("GET", url, false);
+            //xmlhttp.setRequestHeader ("Accept", "application/json");
             xmlhttp.onreadystatechange = function ()
             {
                 var resp;

diff --git a/GeoVis/pom.xml b/GeoVis/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>ch.ninecode.cim</groupId>
         <artifactId>CIMApplication</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
     <groupId>ch.ninecode.geo</groupId>
     <artifactId>GeoVis</artifactId>

diff --git a/GridLAB-D/pom.xml b/GridLAB-D/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>CIMApplication</artifactId>
         <groupId>ch.ninecode.cim</groupId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
     </parent>
     <artifactId>GridLAB-D</artifactId>
     <groupId>ch.ninecode.gl</groupId>

diff --git a/GridLAB-D/src/main/scala/ch/ninecode/esl/Einspeiseleistung.scala b/GridLAB-D/src/main/scala/ch/ninecode/esl/Einspeiseleistung.scala
@@ -636,10 +636,14 @@ case class Einspeiseleistung (session: SparkSession, options: EinspeiseleistungO
             case _ => StorageLevel.fromString ("MEMORY_AND_DISK_SER")
         }
 
-        // identify topological nodes
-        val ntp = new CIMNetworkTopologyProcessor (session, storage_level)
-        val ele = ntp.process (false)
-        log.info (ele.count () + " elements")
+        // identify topological nodes if necessary
+        val tns = session.sparkContext.getPersistentRDDs.filter(_._2.name == "TopologicalNode")
+        if (tns.isEmpty || tns.head._2.isEmpty)
+        {
+            val ntp = new CIMNetworkTopologyProcessor (session, storage_level)
+            val ele = ntp.process (false)
+            log.info (ele.count () + " elements")
+        }
 
         val topo = System.nanoTime ()
         log.info ("topology: " + (topo - read) / 1e9 + " seconds")

diff --git a/GridLAB-D/src/main/scala/ch/ninecode/export/Export.scala b/GridLAB-D/src/main/scala/ch/ninecode/export/Export.scala
@@ -211,10 +211,14 @@ case class Export (session: SparkSession, storage_level: StorageLevel, options:
             case _ => StorageLevel.fromString ("MEMORY_AND_DISK_SER")
         }
 
-        // identify topological nodes
-        val ntp = new CIMNetworkTopologyProcessor (session, storage_level)
-        val ele = ntp.process (false)
-        log.info (ele.count () + " elements")
+        // identify topological nodes if necessary
+        val tns = session.sparkContext.getPersistentRDDs.filter(_._2.name == "TopologicalNode")
+        if (tns.isEmpty || tns.head._2.isEmpty)
+        {
+            val ntp = new CIMNetworkTopologyProcessor (session, storage_level)
+            val ele = ntp.process (false)
+            log.info (ele.count () + " elements")
+        }
 
         val topo = System.nanoTime ()
         log.info ("topology: " + (topo - read) / 1e9 + " seconds")