EC updated to 2.9.1

cassproject · Apr 24, 2019 · 69dada6 · 69dada6
1 parent 9dfc106
commit 69dada6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<ec-version>2.9.0</ec-version>
+		<ec-version>2.9.1</ec-version>
 		<ew-version>5.15.1</ew-version>
 	</properties>
 

diff --git a/src/main/resources/b-skyrepo/kbac.skyrepo.js b/src/main/resources/b-skyrepo/kbac.skyrepo.js
@@ -147,6 +147,8 @@ var inferTypeFromObj = function(o, atType) {
     if (atType != null) 
         return atType;
     var fullType = skyrepoUrlType(o);
+    if (fullType == null) 
+        return fullType;
     fullType = fullType.replace("http://", "");
     fullType = fullType.replace("https://", "");
     fullType = fullType.replace("/", ".");
@@ -574,6 +576,10 @@ var skyrepoSearch = function(q, urlRemainder, start, size, sort, track_scores) {
     for (var i = 0; i < hits.length; i++) {
         var searchResult = hits[i];
         var type = inferTypeFromObj((searchResult)["_source"], null);
+        if (type == null) {
+            hits.splice(i--, 1);
+            continue;
+        }
         var id = (searchResult)["_id"];
         var version = "";
         var hit = "data/";
@@ -741,7 +747,11 @@ var endpointMultiPut = function() {
         var o = ary[i];
         var ld = new EcRemoteLinkedData(null, null);
         ld.copyFrom(o);
-        var id = ld.getGuid();
+        var id = null;
+        if (!EcRepository.alwaysTryUrl && repo != null && !repo.constructor.shouldTryUrl(ld.id)) 
+            id = EcCrypto.md5(ld.id);
+         else 
+            id = ld.getGuid();
         var version = ld.getTimestamp();
         var type = ld.getDottedType();
         (skyrepoPutParsed).call(this, o, id, version, type);

diff --git a/src/main/webapp/cass-editor b/src/main/webapp/cass-editor
diff --git a/src/main/webapp/pom.xml b/src/main/webapp/pom.xml
@@ -11,7 +11,7 @@
 	<url>http://github.com/cassproject/cass</url>
 
 	<properties>
-		<ec-version>2.9.0</ec-version>
+		<ec-version>2.9.1</ec-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+7,948 −7,910		js/cass/cass-editor.js
+4 −6		js/editConcept.js
+4 −6		js/editFramework.js
+15 −0		js/pageManagement.js
+22 −4		js/viewFramework.js
+16 −7		js/viewFrameworks.js