diff --git a/itemrecord.php b/itemrecord.php
index 5fb9ab1..3e29ace 100644
--- a/itemrecord.php
+++ b/itemrecord.php
@@ -138,8 +138,8 @@ INNER JOIN
books_custom_column_2_link
ON books_custom_column_2_link.book = books.id
INNER JOIN
-custom_column_2 ON
- custom_column_2.id = books_custom_column_2_link.value
+custom_column_2
+ON custom_column_2.id = books_custom_column_2_link.value
WHERE
books.id = '$ItemID'");
@@ -147,7 +147,22 @@ while ($row = $publisher_location->fetchArray()) {
$row_publocation = $row['publoc'];
}
+// ---------- Pull subtype information ----------
+$subtype = $db->query("SELECT custom_column_3.value AS subtype
+FROM books
+INNER JOIN
+books_custom_column_3_link
+ON books_custom_column_3_link.book = books.id
+INNER JOIN
+custom_column_3
+ON custom_column_3.id = books_custom_column_3_link.value
+WHERE
+books.id = '$ItemID'");
+
+while ($row = $subtype->fetchArray()) {
+ $row_subtype = $row['subtype'];
+}
@@ -369,6 +384,7 @@ while ($row = $publisher_location->fetchArray()) {
echo 'Location: '.$row_publocation.'
';
echo 'Date: '.$row_pubdate.'
';
echo 'Type: '.$row_type.'
';
+ echo 'Subtype: '.$row_subtype.'
';
echo 'Subjects: ';
while ($row = $tags->fetchArray()) {
$row_tags = $row['name'];
diff --git a/results.php b/results.php
index d6f88e2..af793c9 100644
--- a/results.php
+++ b/results.php
@@ -6,12 +6,14 @@ include_once "settings.php";
$keywordsearch = htmlspecialchars($_GET["kw"]);
$authorsearch = htmlspecialchars($_GET["au"]);
$typesearch = htmlspecialchars($_GET["ty"]);
+$subtypesearch = htmlspecialchars($_GET["st"]);
$seriessearch = htmlspecialchars($_GET["se"]);
$subjectsearch = htmlspecialchars($_GET["su"]);
$socialkw = mb_convert_case($keywordsearch, MB_CASE_TITLE, "UTF-8");
$socialau = mb_convert_case($authorsearch, MB_CASE_TITLE, "UTF-8");
$socialty = mb_convert_case($typesearch, MB_CASE_TITLE, "UTF-8");
+$socialst = mb_convert_case($subtypesearch, MB_CASE_TITLE, "UTF-8");
$socialse = mb_convert_case($seriessearch, MB_CASE_TITLE, "UTF-8");
$socialsu = mb_convert_case($subjectsearch, MB_CASE_TITLE, "UTF-8");
@@ -23,8 +25,10 @@ if (!empty($keywordsearch)) {
$searchtopic = 'Type: '.$socialty;
} elseif (!empty($seriessearch)) {
$searchtopic = 'Series: '.$socialse;
-} else {
+} elseif (!empty($subjectsearch)) {
$searchtopic = 'Subject: '.$socialsu;
+} else {
+ $searchtopic = 'Subtype: '.$socialst;
}
// -------------------- BEGIN DATABASE QUERIES --------------------
@@ -76,6 +80,21 @@ WHERE
custom_column_1.value = '$typesearch'
ORDER BY books.title ASC");
+$subtypequery = $db->query("SELECT
+DISTINCT books.id AS id,
+books.title AS title,
+SUBSTR(comments.text,0,120) AS excerpt
+FROM books
+INNER JOIN
+comments ON comments.book = books.id
+INNER JOIN
+books_custom_column_3_link ON books_custom_column_3_link.book = books.id
+INNER JOIN
+custom_column_3 ON custom_column_3.id = books_custom_column_3_link.value
+WHERE
+custom_column_3.value = '$subtypesearch'
+ORDER BY books.title ASC");
+
$seriesquery = $db->query("SELECT
DISTINCT books.id AS id,
books.title AS title,
@@ -109,6 +128,11 @@ value
FROM custom_column_1
ORDER BY value ASC");
+$subtypes = $db->query("SELECT
+value
+FROM custom_column_3
+ORDER BY value ASC");
+
?>
@@ -158,9 +182,12 @@ ORDER BY value ASC");
} elseif (!empty($seriessearch)) {
echo '';
echo '';
- } else {
+ } elseif (!empty($subjectsearch)) {
echo '';
echo '';
+ } else {
+ echo '';
+ echo '';
}
?>
@@ -308,7 +335,7 @@ ORDER BY value ASC");
echo '
'.$row_title.' : '.strip_tags($row_excerpt).'...
'.$row_title.' : '.strip_tags($row_excerpt).'...
'.$row_title.' : '.strip_tags($row_excerpt).'...