From 316c95cad96e89afc68d315e9f4fa5b9cf322006 Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@gmail.com>
Date: Tue, 20 Mar 2018 12:13:27 -0400
Subject: * Allow sorting by book chapter

---
 sort.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'sort.php')

diff --git a/sort.php b/sort.php
index 887178d..ab72d49 100644
--- a/sort.php
+++ b/sort.php
@@ -51,15 +51,21 @@ $bookOrder = array(
 	$aVerse = $a['verse'] ?: '';
 	$bVerse = $b['verse'] ?: '';
 	$matches = array();
-	$aBookKey = 3000;
-	$bBookKey = 3000;
+	$aBookKey = 100000;
+	$bBookKey = 100000;
 	if ( preg_match( '/^[0-9i]*\ ?[A-Z.]+/i', $aVerse, $matches ) ){
 		$aBook = $matches[0];
-		$aBookKey = array_search( $aBook, $bookOrder );
+		$aBookKey = array_search( $aBook, $bookOrder ) * 1000;
+		if ( preg_match( '/^.+?(\d+)/', $aVerse, $matches ) ){
+			$aBookKey += $matches[1];
+		}
 	}
 	if ( preg_match( '/^[0-9i]*\ ?[A-Z.]+/i', $bVerse, $matches ) ){
 		$bBook = $matches[0];
-		$bBookKey = array_search( $bBook, $bookOrder );
+		$bBookKey = array_search( $bBook, $bookOrder ) * 1000;
+		if ( preg_match( '/^.+?(\d+)/', $bVerse, $matches ) ){
+			$bBookKey += $matches[1];
+		}
 	}
 
 	return $aBookKey - $bBookKey;
-- 
cgit 1.4.1