From 10b3eebae26f05c74c7d7df1522847344c93cacc Mon Sep 17 00:00:00 2001 From: Jason House Date: Sun, 22 Mar 2020 11:38:58 +0900 Subject: [PATCH] Fixing 404 Changing RSS check to anchors to copy --- .../jasonhhouse/gaps/controller/RSSController.java | 9 +++------ GapsWeb/src/main/resources/templates/error/404.html | 12 ++++++------ GapsWeb/src/main/resources/templates/rssCheck.html | 10 +++------- buildVersion.sh | 6 +++--- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java index 2676aaf..5fb306f 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java @@ -43,12 +43,9 @@ public class RSSController { } @RequestMapping(method = RequestMethod.GET, - path = "/rss") - public String getRss(@RequestParam("library") String library) { - LOGGER.info("getRss( " + library + " )"); - String[] keys = library.split("_"); - String machineIdentifier = keys[0]; - int libraryKey = Integer.parseInt(keys[1]); + path = "/rss/{machineIdentifier}/{libraryKey}") + public String getRss(@PathVariable("machineIdentifier") String machineIdentifier, @PathVariable("libraryKey") Integer libraryKey) { + LOGGER.info("getRss( " + machineIdentifier + ", " + libraryKey + " )"); String rss = null; if (ioService.doesRssFileExist(machineIdentifier, libraryKey)) { diff --git a/GapsWeb/src/main/resources/templates/error/404.html b/GapsWeb/src/main/resources/templates/error/404.html index 43503c4..281e9b5 100644 --- a/GapsWeb/src/main/resources/templates/error/404.html +++ b/GapsWeb/src/main/resources/templates/error/404.html @@ -14,15 +14,15 @@ Gaps - - - + + + - +