Stable release of v2.0.31
Fixed #10 so that exact search results now work correctly. Update scripture loader to version 3.0.3.
This commit is contained in:
parent
4f260d11e3
commit
20da2e8275
GPG Key ID:
14DECD44E7E1BB95
@ -1,3 +1,8 @@
|
||||
# v2.0.31
|
||||
|
||||
- Fixed #10 so that exact search results now work correctly.
|
||||
- Update scripture loader to version 3.0.3
|
||||
|
||||
# v2.0.30
|
||||
|
||||
- Update scripture loader to version 3.0.2
|
||||
|
||||
10
README.md
10
README.md
@ -1,4 +1,4 @@
|
||||
# Get Bible (2.0.30)
|
||||
# Get Bible (2.0.31)
|
||||
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
|
||||
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
|
||||
+ *Name*: [Get Bible](https://getbible.net)
|
||||
+ *First Build*: 3rd December, 2015
|
||||
+ *Last Build*: 30th November, 2023
|
||||
+ *Version*: 2.0.30
|
||||
+ *Last Build*: 4th December, 2023
|
||||
+ *Version*: 2.0.31
|
||||
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
|
||||
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
||||
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
|
||||
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
|
||||
> never making one mistake or taking any coffee break.)
|
||||
|
||||
+ *Line count*: **200920**
|
||||
+ *File count*: **1742**
|
||||
+ *Line count*: **200940**
|
||||
+ *File count*: **1743**
|
||||
+ *Folder count*: **167**
|
||||
|
||||
**370 Hours** or **46 Eight Hour Days** (the actual time the author spent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Get Bible (2.0.30)
|
||||
# Get Bible (2.0.31)
|
||||
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
|
||||
+ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
|
||||
+ *Name*: [Get Bible](https://getbible.net)
|
||||
+ *First Build*: 3rd December, 2015
|
||||
+ *Last Build*: 30th November, 2023
|
||||
+ *Version*: 2.0.30
|
||||
+ *Last Build*: 4th December, 2023
|
||||
+ *Version*: 2.0.31
|
||||
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
|
||||
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
|
||||
|
||||
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
|
||||
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
|
||||
> never making one mistake or taking any coffee break.)
|
||||
|
||||
+ *Line count*: **200920**
|
||||
+ *File count*: **1742**
|
||||
+ *Line count*: **200940**
|
||||
+ *File count*: **1743**
|
||||
+ *Folder count*: **167**
|
||||
|
||||
**370 Hours** or **46 Eight Hour Days** (the actual time the author spent)
|
||||
|
||||
1
admin/sql/updates/mysql/2.0.30.sql
Normal file
1
admin/sql/updates/mysql/2.0.30.sql
Normal file
@ -0,0 +1 @@
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<extension type="component" version="3.10" method="upgrade">
|
||||
<name>COM_GETBIBLE</name>
|
||||
<creationDate>30th November, 2023</creationDate>
|
||||
<creationDate>4th December, 2023</creationDate>
|
||||
<author>Llewellyn van der Merwe</author>
|
||||
<authorEmail>joomla@vdm.io</authorEmail>
|
||||
<authorUrl>https://getbible.net</authorUrl>
|
||||
<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
|
||||
<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
|
||||
<version>2.0.30</version>
|
||||
<version>2.0.31</version>
|
||||
<description><![CDATA[
|
||||
<h1>Get Bible (v.2.0.30)</h1>
|
||||
<h1>Get Bible (v.2.0.31)</h1>
|
||||
<div style="clear: both;"></div>
|
||||
<p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.
|
||||
|
||||
|
||||
@ -1539,7 +1539,7 @@ class com_getbibleInstallerScript
|
||||
echo '<a target="_blank" href="https://getbible.net" title="Get Bible">
|
||||
<img src="components/com_getbible/assets/images/vdm-component.jpg"/>
|
||||
</a>
|
||||
<h3>Upgrade to Version 2.0.30 Was Successful! Let us know if anything is not working as expected.</h3>';
|
||||
<h3>Upgrade to Version 2.0.31 Was Successful! Let us know if anything is not working as expected.</h3>';
|
||||
|
||||
// Set db if not set already.
|
||||
if (!isset($db))
|
||||
|
||||
@ -439,18 +439,24 @@ class GetbibleModelSearch extends ListModel
|
||||
}
|
||||
// 3 = EXACT PHRASE
|
||||
elseif ($this->words == 3)
|
||||
{
|
||||
if($this->match == 2)
|
||||
{
|
||||
// 2 = partial match
|
||||
$search = $db->quote('%' . $db->escape($this->search, true) . '%');
|
||||
$conditions[] = '( ' . $case . ' a.text LIKE ' . $search . ')';
|
||||
if ($this->match == 2) {
|
||||
$words = $this->splitSentence($this->search);
|
||||
$search = [];
|
||||
foreach ($words as $word) {
|
||||
$search[] = '%' . $db->escape($word, true) . '%';
|
||||
}
|
||||
elseif($this->match == 1)
|
||||
|
||||
// Construct the LIKE clause with wildcards between each word for partial matches
|
||||
$conditions[] = '(' . $case . ' a.text LIKE ' . $db->quote(implode('%', $search)) . ')';
|
||||
}
|
||||
elseif ($this->match == 1)
|
||||
{
|
||||
// exact match
|
||||
// 1 = exact match
|
||||
// For exact phrase, escape and quote the entire phrase and use REGEXP to match it exactly
|
||||
$search = $case . ' a.text REGEXP ' . $db->quote('[[:<:]]' . $db->escape($this->search, true) . '[[:>:]]');
|
||||
$conditions[] = '( '. $search . ')';
|
||||
$conditions[] = '(' . $search . ')';
|
||||
}
|
||||
}
|
||||
// 1 = ALL WORDS
|
||||
@ -586,26 +592,17 @@ class GetbibleModelSearch extends ListModel
|
||||
$this->searchWords = array_map('mb_strtolower', $this->searchWords);
|
||||
}
|
||||
|
||||
// If we are looking for an exact match
|
||||
if ($this->match == 1)
|
||||
{
|
||||
if ($this->words == 3)
|
||||
{
|
||||
// The search string is considered as one phrase
|
||||
return $word == $this->search;
|
||||
}
|
||||
else
|
||||
// 1 = exact match
|
||||
if ($this->match == 3)
|
||||
{
|
||||
// The search string is considered as separate words
|
||||
return in_array($word, $this->searchWords);
|
||||
foreach ($this->searchWords as $search_word)
|
||||
{
|
||||
if ($word === $search_word)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($this->words == 3)
|
||||
{
|
||||
// The search string is considered as one phrase
|
||||
return mb_strpos($word, $this->search) !== false;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -618,7 +615,6 @@ class GetbibleModelSearch extends ListModel
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -503,4 +503,22 @@
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="3.*"/>
|
||||
</update>
|
||||
<update>
|
||||
<name>Get Bible</name>
|
||||
<description>The Bible for Joomla</description>
|
||||
<element>pkg_getbible</element>
|
||||
<type>package</type>
|
||||
<client>site</client>
|
||||
<version>2.0.31</version>
|
||||
<infourl title="Get Bible!">https://getbible.net</infourl>
|
||||
<downloads>
|
||||
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v2.0.31.zip</downloadurl>
|
||||
</downloads>
|
||||
<tags>
|
||||
<tag>stable</tag>
|
||||
</tags>
|
||||
<maintainer>Llewellyn van der Merwe</maintainer>
|
||||
<maintainerurl>https://getbible.net</maintainerurl>
|
||||
<targetplatform name="joomla" version="3.*"/>
|
||||
</update>
|
||||
</updates>
|
||||
Loading…
Reference in New Issue
Block a user