start of bugfix and minor updates to 1.1.0 branch

synapticloop · synapticloop · commit 82c0d8f0da84 · 2024-09-24T10:37:59.000+10:00
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 ```
 
-`Build and test 'main' branch:` [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main)
+`Build and test 'main' branch:` [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/circleci/3Y1eqqe4mcvtSZuzJnQ3tJ/DyFKUm7c7AoLa1wHmRjAnf/tree/main) (courtesy of Circle-CI)
 
 `Latest release tag:` ![GitHub Tag](https://img.shields.io/github/v/tag/synapticloop/panl)
 
@@ -212,8 +212,16 @@ version
 **A Note On Running The Commands**
 
 *These are the commands for either Microsoft Windows or *NIX operating systems
-(Linux/Apple Macintosh).  Should there be any errors - see the ‘Getting Started’ section for a more in-depth explanation and approach.***
+(Linux/Apple Macintosh).  Should there be any errors - see the ‘Getting Started’ section for a more in-depth explanation and approach.**
 
+---
+
+> **WARNING:** The Solr Release version `9.7.0` has changed the options for creating a new example cloud.
+> The command line option has changed from `-noprompt` to `--no-prompt`
+
+> All other commands remain the same
+
+---
 
 ```
 **IMPORTANT**: You will need to replace the
@@ -331,6 +339,11 @@ Choose a collection/fieldset and search, facet, sort, paginate and view the resu
 
 ## Starting up the example cloud
 
+> **WARNING:** The Solr Release version `9.7.0` has changed the options for starting a new example cloud.
+> The command line option has changed from `-cloud` to `--cloud`
+
+> All other commands remain the same - For versions greater than `9.7.0` they have re-added the `-cloud` option 
+
 If you have stopped the example Solr server, starting it up:
 
 ### _Windows_
@@ -373,7 +386,12 @@ with the release files named `solr-panl-9-x.x.x`
 
 # Version History
 
-## 1.2.0 - more like this (codename `needy-phanton`) **UNDER DEVELOPEMENT**
+## 1.2.0 - more like this (codename `needy-phanton`) **UNDER DEVELOPMENT**
+
+## 1.1.1 - the better update (codename `grizzled-pebble`)
+
+ - Bug fixes
+   - Fixed 'OR' facet `before` and `after` URL values 
 
 ## 1.1.0 - the better update (codename `broad-firefly`) 
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-panl.version=1.2.0
+panl.version=1.1.1
 panl.solr.version=9
diff --git a/src/main/java/com/synapticloop/panl/editor/Constants.java b/src/main/java/com/synapticloop/panl/editor/Constants.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2008-2024 synapticloop.
+ *
+ * https://github.com/synapticloop/panl
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.synapticloop.panl.editor;
+
+import javax.swing.*;
+
+public class Constants {
+	public static final ImageIcon ICON_APP =
+		new ImageIcon(PanlEditor.class.getResource("/webapp/static/favicon.png"));
+
+
+
+	public static final ImageIcon ICON_MOON =
+		new ImageIcon(PanlEditor.class.getResource("/images/moon.png"));
+	public static final ImageIcon ICON_SUN =
+		new ImageIcon(PanlEditor.class.getResource("/images/sun.png"));
+
+
+
+	public static final ImageIcon ICON_FILE =
+		new ImageIcon(PanlEditor.class.getResource("/images/file.png"));
+	public static final ImageIcon ICON_FILE_WHITE =
+		new ImageIcon(PanlEditor.class.getResource("/images/file-white.png"));
+
+	public static final ImageIcon ICON_SAVE =
+		new ImageIcon(PanlEditor.class.getResource("/images/save.png"));
+	public static final ImageIcon ICON_SAVE_WHITE =
+		new ImageIcon(PanlEditor.class.getResource("/images/save-white.png"));
+
+	public static final ImageIcon ICON_QUIT =
+		new ImageIcon(PanlEditor.class.getResource("/images/quit.png"));
+	public static final ImageIcon ICON_QUIT_WHITE =
+		new ImageIcon(PanlEditor.class.getResource("/images/quit-white.png"));
+
+	public static final ImageIcon ICON_RECENT =
+		new ImageIcon(PanlEditor.class.getResource("/images/clock.png"));
+	public static final ImageIcon ICON_RECENT_WHITE =
+		new ImageIcon(PanlEditor.class.getResource("/images/clock-white.png"));
+}
diff --git a/src/main/java/com/synapticloop/panl/editor/NewProject.java b/src/main/java/com/synapticloop/panl/editor/NewProject.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2008-2024 synapticloop.
+ *
+ * https://github.com/synapticloop/panl
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.synapticloop.panl.editor;
+
+public class NewProject {
+}
diff --git a/src/main/java/com/synapticloop/panl/editor/PanlEditor.java b/src/main/java/com/synapticloop/panl/editor/PanlEditor.java
@@ -34,38 +34,9 @@
 import java.awt.*;
 import java.io.File;
 
-public class PanlEditor {
-	private static final ImageIcon ICON_APP =
-		new ImageIcon(PanlEditor.class.getResource("/webapp/static/favicon.png"));
-
-
-
-	private static final ImageIcon ICON_MOON =
-		new ImageIcon(PanlEditor.class.getResource("/images/moon.png"));
-	private static final ImageIcon ICON_SUN =
-		new ImageIcon(PanlEditor.class.getResource("/images/sun.png"));
-
-
+import static com.synapticloop.panl.editor.Constants.*;
 
-	private static final ImageIcon ICON_FILE =
-		new ImageIcon(PanlEditor.class.getResource("/images/file.png"));
-	private static final ImageIcon ICON_FILE_WHITE =
-		new ImageIcon(PanlEditor.class.getResource("/images/file-white.png"));
-
-	private static final ImageIcon ICON_SAVE =
-		new ImageIcon(PanlEditor.class.getResource("/images/save.png"));
-	private static final ImageIcon ICON_SAVE_WHITE =
-		new ImageIcon(PanlEditor.class.getResource("/images/save-white.png"));
-
-	private static final ImageIcon ICON_QUIT =
-		new ImageIcon(PanlEditor.class.getResource("/images/quit.png"));
-	private static final ImageIcon ICON_QUIT_WHITE =
-		new ImageIcon(PanlEditor.class.getResource("/images/quit-white.png"));
-
-	private static final ImageIcon ICON_RECENT =
-		new ImageIcon(PanlEditor.class.getResource("/images/clock.png"));
-	private static final ImageIcon ICON_RECENT_WHITE =
-		new ImageIcon(PanlEditor.class.getResource("/images/clock-white.png"));
+public class PanlEditor {
 
 	private boolean isDarkUI = false;
 
@@ -78,6 +49,7 @@ public void show() {
 			System.err.println("Failed to initialize Flat Look and Feel");
 		}
 
+
 		JFrame mainWindowFrame = new JFrame("Panl Configuration Editor");
 		mainWindowFrame.setIconImage(ICON_APP.getImage());
 
diff --git a/src/main/java/com/synapticloop/panl/server/handler/tokeniser/token/facet/DateRangeFacetLpseToken.java b/src/main/java/com/synapticloop/panl/server/handler/tokeniser/token/facet/DateRangeFacetLpseToken.java
@@ -98,7 +98,7 @@ public DateRangeFacetLpseToken(
 				"' (solr field '" +
 				this.solrField +
 				"') with parsed value '" +
-				this.previousNext +
+				this.previousNext.trim() +
 				" " +
 				value +
 				" " +
diff --git a/src/main/java/com/synapticloop/panl/server/handler/tokeniser/token/facet/RangeFacetLpseToken.java b/src/main/java/com/synapticloop/panl/server/handler/tokeniser/token/facet/RangeFacetLpseToken.java
@@ -192,7 +192,7 @@ public RangeFacetLpseToken(
 				"') incoming value '" +
 				this.originalValue +
 				"', parsed value '" +
-				(isRangeToken ? "RANGE(" + value +":" + toValue + ") " + (hasInfix ? "with" : "without") + " infix" : value) +
+				("RANGE(" + value + ":" + toValue + ") " + (hasInfix ? "with" : "without") + " infix" ) +
 				"'.");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-panl.version=1.2.0`
	`1`	`+panl.version=1.1.1`
`2`	`2`	`panl.solr.version=9`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public RangeFacetLpseToken(`
`192`	`192`	`"') incoming value '" +`
`193`	`193`	`this.originalValue +`
`194`	`194`	`"', parsed value '" +`
`195`		`- (isRangeToken ? "RANGE(" + value +":" + toValue + ") " + (hasInfix ? "with" : "without") + " infix" : value) +`
	`195`	`+ ("RANGE(" + value + ":" + toValue + ") " + (hasInfix ? "with" : "without") + " infix" ) +`
`196`	`196`	`"'.");`
`197`	`197`	`}`
`198`	`198`