7.3.0 stable version

wiris · Jun 4, 2018 · 0de889a · 0de889a
1 parent 680d16f
commit 0de889a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.2.0.1388
+7.3.0.1389
diff --git a/integration/lib/VERSION b/integration/lib/VERSION
@@ -1 +1 @@
-7.2.0.1388
+7.3.0.1389
diff --git a/integration/lib/com/wiris/plugin/impl/CacheImpl.class.php b/integration/lib/com/wiris/plugin/impl/CacheImpl.class.php
@@ -103,7 +103,9 @@ public function set($key, $value) {
 		$parent = $this->getFolderStore($this->cacheFolder, $digest);
 		$parent->mkdirs();
 		$store = $this->getFileStoreWithParent($parent, $digest, $extension);
-		$store->writeBinary($value);
+		if(!$store->exists()) {
+			$store->writeBinary($value);
+		}
 	}
 	public $cacheFolder;
 	public $conf;

diff --git a/integration/lib/com/wiris/util/type/Arrays.class.php b/integration/lib/com/wiris/util/type/Arrays.class.php
@@ -201,5 +201,53 @@ static function firstElement($elements) {
 	static function lastElement($elements) {
 		return $elements[$elements->length - 1];
 	}
+	static function intersectSorted($a, $b) {
+		if($a === null) {
+			return (($b === null) ? null : com_wiris_util_type_Arrays::copyArray($b));
+		} else {
+			if($b === null) {
+				return com_wiris_util_type_Arrays::copyArray($a);
+			} else {
+				$v = new _hx_array(array());
+				$i = 0;
+				$j = 0;
+				while($i < $a->length && $j < $b->length) {
+					$cmp = Reflect::compare($a[$i], $b[$j]);
+					if($cmp === 0) {
+						$v->push($a[$i]);
+						$i++;
+						$j++;
+					} else {
+						if($cmp < 0) {
+							$i++;
+						} else {
+							$j++;
+						}
+					}
+					unset($cmp);
+				}
+				return $v;
+			}
+		}
+	}
+	static function difference($a, $b) {
+		$v = new _hx_array(array());
+		if($a === null) {
+			return $v;
+		} else {
+			if($b === null) {
+				return com_wiris_util_type_Arrays::copyArray($a);
+			}
+		}
+		$it = $a->iterator();
+		while($it->hasNext()) {
+			$e = $it->next();
+			if(com_wiris_util_type_Arrays::indexOfElement($b, $e) < 0) {
+				$v->push($e);
+			}
+			unset($e);
+		}
+		return $v;
+	}
 	function __toString() { return 'com.wiris.util.type.Arrays'; }
 }
diff --git a/thirdpartylibs.xml b/thirdpartylibs.xml
@@ -3,7 +3,7 @@
     <library>
         <location>integration</location>
         <name>MathType integration engine</name>
-        <version>7.2.0.1388</version>
+        <version>7.3.0.1389</version>
         <license>GPL</license>
         <licenseversion>3.0+</licenseversion>
     </library>

diff --git a/version.php b/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2018050800;
-$plugin->release = '7.2.0.1388';
+$plugin->version = 2018060400;
+$plugin->release = '7.3.0.1389';
 $plugin->requires = 2011120511;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'filter_wiris';