From 520142413eb1caa63954adfa443bb886670e33d3 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <djenkins.cadc@gmail.com>
Date: Wed, 5 Aug 2026 11:36:36 -0700
Subject: [PATCH] fix: fix for page base

---
 citation/VERSION                           | 2 +-
 citation/src/main/webapp/index.jsp         | 2 +-
 citation/src/main/webapp/landing/index.jsp | 2 +-
 citation/src/main/webapp/request/index.jsp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/citation/VERSION b/citation/VERSION
index 606f89a9..fa9f0ab2 100644
--- a/citation/VERSION
+++ b/citation/VERSION
@@ -2,6 +2,6 @@
 # semantic version tag: major.minor[.patch]
 # build version tag: timestamp
 # tag: {semantic}-{build}
-VER=1.0.1
+VER=1.0.2
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/citation/src/main/webapp/index.jsp b/citation/src/main/webapp/index.jsp
index ac8dd10b..b9a51062 100644
--- a/citation/src/main/webapp/index.jsp
+++ b/citation/src/main/webapp/index.jsp
@@ -23,7 +23,7 @@
     <meta charset='utf-8'>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="${fn:substring(url, 0, fn:length(url) - fn:length(uri))}${req.contextPath}/" />
+    <base href="${baseURL}${contextPath}/" />
 
     <c:import url="${baseURL}/canfar/includes/_page_top_styles.shtml" />
     <link rel="stylesheet" type="text/css"
diff --git a/citation/src/main/webapp/landing/index.jsp b/citation/src/main/webapp/landing/index.jsp
index 2c6e692d..7902d7ae 100644
--- a/citation/src/main/webapp/landing/index.jsp
+++ b/citation/src/main/webapp/landing/index.jsp
@@ -22,7 +22,7 @@
     <meta charset='utf-8'>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="${fn:substring(url, 0, fn:length(url) - fn:length(uri))}${req.contextPath}/" />
+    <base href="${baseURL}${contextPath}/" />
 
     <c:import url="${baseURL}/canfar/includes/_page_top_styles.shtml" />
     <link rel="stylesheet" type="text/css"
diff --git a/citation/src/main/webapp/request/index.jsp b/citation/src/main/webapp/request/index.jsp
index 906734e9..d09029e6 100644
--- a/citation/src/main/webapp/request/index.jsp
+++ b/citation/src/main/webapp/request/index.jsp
@@ -22,7 +22,7 @@
     <meta charset='utf-8'>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <base href="${fn:substring(url, 0, fn:length(url) - fn:length(uri))}${req.contextPath}/" />
+    <base href="${baseURL}${contextPath}/" />
 
     <c:import url="${baseURL}/canfar/includes/_page_top_styles.shtml" />
     <link rel="stylesheet" type="text/css"