Merge pull request #5 from kkthek/fix-for-user-pref-dialog

Fix for user pref dialog
kkthek · May 31, 2024 · f0eea82 · f0eea82
2 parents e8d219d + f9d6739
commit f0eea82
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 562 deletions.
diff --git a/.project b/.project
diff --git a/ChangeLog b/ChangeLog
@@ -2,14 +2,15 @@ Enhanced Retrieval extension ChangeLog
 ======================================
 
 VERSION 3.0
-* updated extension.json for MW1.38
+* updated extension.json for MW1.39
 * renamed global config variable
   * from $SOLRhost, $SOLRport, $SOLRuser, $SOLRpass, $SOLRcore
   * to $fsgSolrHost, $fsgSolrPort, $fsgSolrUser, $fsgSolrPass, $fsgSolrCore
 * removed $fsgCustomConstraint config variable
 * removed unused config variables
-** $fsgScriptPath
+  * $fsgScriptPath
   * $fsgIP
+* Enhanced Retrieval now has a user preference dialog
 
 VERSION 2.3
 	- Got rid of separate proxy implementation. Instead, the proxy now is a REST endpoint of MW.

diff --git a/DefaultSettings.php b/DefaultSettings.php
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
-== Enhanced Retrieval Extension 2.5 ==
+== Enhanced Retrieval Extension 3.0 ==
 
 === Requirements ===
-* PHP 7.x
+* PHP 7.4.x
 * Composer
-* MediaWiki 1.38+
-* SMW 3.x
+* MediaWiki 1.39.x (LTS)
+* SMW 3.x or 4.x
 * Apache SOLR server v8.30+
 
 	You can setup your own Solr server. Please use the SOLR-schema given in:

diff --git a/extension.json b/extension.json
@@ -7,10 +7,10 @@
 	"descriptionmsg": "facetedsearch-desc",
 	"license-name": "GPL-2.0-or-later",
 	"type": "other",
-	"version": "2.5",
+	"version": "3.0.1",
 	"manifest_version": 2,
 	"requires": {
-		"MediaWiki": ">= 1.38",
+		"MediaWiki": ">= 1.39",
 		"platform": {
 			"php": ">= 7.4"
 		}

diff --git a/scripts/FacetedSearch/FS_DateFacetClusterer.js b/scripts/FacetedSearch/FS_DateFacetClusterer.js
@@ -117,22 +117,22 @@ FacetedSearch.classes.DateFacetClusterer = function (facetName, plainName) {
 			if (dateTimePropertyClusters['max']) {
 				var clusterMax = dateTimePropertyClusters['max'];
 				clusterMax = parseInt(clusterMax.replace(/-|:/g,''));
-				if (max > clusterMax) {
+				if (Number(max) > clusterMax) {
 					max = clusterMax;
 				}
 			}
 
 			if (dateTimePropertyClusters['min']) {
 				var clusterMin = dateTimePropertyClusters['min'];
 				clusterMin = parseInt(clusterMin.replace(/-|:/g,''));
-				if (min < clusterMin) {
+				if (Number(min) < clusterMin) {
 					min = clusterMin;
 				}
 			}
 
 		}
 
-		var incr = findIncrement(min, max);
+		var incr = findIncrement(Number(min), Number(max));
 
 		mIncrementField = incr.getIncrementField();
 
@@ -153,9 +153,9 @@ FacetedSearch.classes.DateFacetClusterer = function (facetName, plainName) {
 	/**
 	 * Calculates a the best suited increment for ranges between the data/time
 	 * values min and max that are given as strings that represent long values.
-	 * @param {long} min
+	 * @param {Number} min
 	 * 		Lower bound of date/time
-	 * @param {long} max
+	 * @param {Number} max
 	 * 		Upper bound of date/time
 	 * 
 	 * @return {Object}