From a23ca24bd6a40d7973f41a384d0a86bd2953055a Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Sat, 6 Aug 2022 10:01:30 -0400
Subject: [PATCH] Fix MACRO show_series link to series page

---
 templates/content-correspondent.tpl.html  |  2 +-
 templates/content-episodes.tpl.html       |  2 +-
 templates/content-index.tpl.html          | 12 ++++++------
 templates/shared-episode-summary.tpl.html |  7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index 0f027f4..47fc828 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -17,7 +17,7 @@
 		hosts.local_image,
 		hosts.hostid, 
 		hosts.host, hosts.email,
-		miniseries.name AS series
+		miniseries.name AS series, miniseries.id AS seriesid
 	FROM eps 
 	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
diff --git a/templates/content-episodes.tpl.html b/templates/content-episodes.tpl.html
index b8778bc..e53fe9e 100644
--- a/templates/content-episodes.tpl.html
+++ b/templates/content-episodes.tpl.html
@@ -15,7 +15,7 @@
 		eps.duration, eps.notes, eps.tags,
         hosts.hostid, 
         hosts.host, hosts.email, hosts.local_image, 
-		miniseries.name AS series
+		miniseries.name AS series, miniseries.id AS seriesid
     FROM eps 
 	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 70c9825..b4563fd 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -25,7 +25,7 @@
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
 <!--% FOREACH latest_episodes IN DBI.query('
 	SELECT 
-	substr(\'0000\' || eps.id, -4, 4) AS [id], 
+	eps.id, 
 	CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , 
 	eps.date, eps.license, eps.duration,
 	eps.title, eps.summary, eps.tags, 
@@ -33,7 +33,7 @@
 	hosts.local_image,
 	hosts.hostid, 
 	hosts.host, hosts.email,
-	miniseries.name AS series
+	miniseries.name AS series, miniseries.id AS seriesid
 	FROM eps 
 	INNER JOIN hosts ON eps.hostid = hosts.hostid
 	INNER JOIN miniseries ON eps.series = miniseries.id
@@ -51,7 +51,7 @@
 		<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><!--% END %-->
 	<br>Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->/index.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% latest_episodes.explicit %--> and released under a <!--% latest_episodes.license %--> license. <br>
 <strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
-<small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series) %-->
+<small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %-->
  <a href="eps.php?id=3628#comments">comments (0)</a></small>
 		</p>
 	</header>
@@ -78,13 +78,13 @@
     </header>
 <!--% FOREACH last_5_weeks_episodes IN DBI.query('
 	SELECT 
-        substr(\'0000\' || eps.id, -4, 4) AS [id], 
+        eps.id, 
         CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit , 
         eps.date, eps.license, eps.title, eps.summary, 
 		eps.duration, eps.notes, eps.tags,
-        substr(\'0000\' || hosts.hostid, -4, 4) AS [hostid], 
+        hosts.hostid, 
         hosts.host, hosts.email, hosts.local_image, 
-		miniseries.name AS series
+		miniseries.name AS series, miniseries.id AS seriesid
     FROM eps 
 	INNER JOIN hosts ON eps.hostid = hosts.hostid 
 	INNER JOIN miniseries ON eps.series = miniseries.id
diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index bcc7dbb..52c15ef 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -1,5 +1,6 @@
-<!--% MACRO show_series(series)  IF series != "" %-->
-<label>Series:</label> <a href="series.php?id=11"><!--% series %--></a>.
+<!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% MACRO show_series(series, series_id)  IF series != "" %-->
+	<label>Series:</label> <a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></a>.
 <!--% END %-->
 <!--% MACRO show_summary(show, hide_host) BLOCK %-->
 
@@ -7,7 +8,7 @@
 	hosted by <a href="correspondents/host<!--% show.id %-->.html"><!--% show.host %--></a>
 	<!--% END %-->
 	</h3>
-	<p class="meta"><span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% show.duration %-->.</span> <span><label>Flag:</label> <!--% show.explicit %-->.</span> <span><!--% show_series(show.series) %--></span>  <br>
+	<p class="meta"><span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% show.duration %-->.</span> <span><label>Flag:</label> <!--% show.explicit %-->.</span> <span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
 	<span><label>Tags:</label> <em><!--% show.tags %--></em>.</span><br>
     <!--% show.summary %-->
 	</p>