getBible/joomla-component
6
3
Fork 0
Code Issues Pull Requests Wiki Activity

Stable release of v2.0.32

Browse Source 
Fixed other search related issues.
This commit is contained in:
Robot 2023-12-04 12:22:29 +02:00
parent 20da2e8275
commit d94111f66c
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
8 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# v2.0.32
- Fixed other search related issues.
# v2.0.31
- Fixed #10 so that exact search results now work correctly.

8
README.md
View File

@ -1,4 +1,4 @@
# Get Bible (2.0.31)
# Get Bible (2.0.32)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015
+ *Last Build*: 4th December, 2023
+ *Version*: 2.0.31
+ *Version*: 2.0.32
+ *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*: **200940**
+ *File count*: **1743**
+ *Line count*: **200979**
+ *File count*: **1744**
+ *Folder count*: **167**
**370 Hours** or **46 Eight Hour Days** (the actual time the author spent)

8
admin/README.txt
View File

@ -1,4 +1,4 @@
# Get Bible (2.0.31)
# Get Bible (2.0.32)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/master/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015
+ *Last Build*: 4th December, 2023
+ *Version*: 2.0.31
+ *Version*: 2.0.32
+ *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*: **200940**
+ *File count*: **1743**
+ *Line count*: **200979**
+ *File count*: **1744**
+ *Folder count*: **167**
**370 Hours** or **46 Eight Hour Days** (the actual time the author spent)

1
admin/sql/updates/mysql/2.0.31.sql Normal file
View File

@ -0,0 +1 @@

4
getbible.xml
View File

@ -7,9 +7,9 @@
<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.31</version>
<version>2.0.32</version>
<description><![CDATA[
<h1>Get Bible (v.2.0.31)</h1>
<h1>Get Bible (v.2.0.32)</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.

2
script.php
View File

@ -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.31 Was Successful! Let us know if anything is not working as expected.</h3>';
<h3>Upgrade to Version 2.0.32 Was Successful! Let us know if anything is not working as expected.</h3>';
// Set db if not set already.
if (!isset($db))

56
site/models/search.php
View File

@ -403,15 +403,18 @@ class GetbibleModelSearch extends ListModel
$i = 0;
foreach ($words as $word)
{
if ($i == 0)
if ($this->hasLength($word))
{
$condition .= $db->quote('%' . $db->escape($word, true) . '%');
if ($i == 0)
{
$condition .= $db->quote('%' . $db->escape($word, true) . '%');
}
else
{
$condition .= ' OR ' . $case . ' a.text LIKE ' . $db->quote('%' . $db->escape($word, true) . '%');
}
$i++;
}
else
{
$condition .= ' OR ' . $case . ' a.text LIKE ' . $db->quote('%' . $db->escape($word, true) . '%');
}
$i++;
}
$conditions[] = $condition . ')';
@ -424,15 +427,18 @@ class GetbibleModelSearch extends ListModel
$i = 0;
foreach ($words as $word)
{
if ($i == 0)
if ($this->hasLength($word))
{
$condition .= $db->quote('[[:<:]]' . $db->escape($word, true). '[[:>:]]');
if ($i == 0)
{
$condition .= $db->quote('[[:<:]]' . $db->escape($word, true). '[[:>:]]');
}
else
{
$condition .= ' OR ' . $case . ' a.text REGEXP '. $db->quote('[[:<:]]' . $db->escape($word, true) . '[[:>:]]');
}
$i++;
}
else
{
$condition .= ' OR ' . $case . ' a.text REGEXP '. $db->quote('[[:<:]]' . $db->escape($word, true) . '[[:>:]]');
}
$i++;
}
$conditions[] = $condition . ')';
}
@ -444,8 +450,12 @@ class GetbibleModelSearch extends ListModel
if ($this->match == 2) {
$words = $this->splitSentence($this->search);
$search = [];
foreach ($words as $word) {
$search[] = '%' . $db->escape($word, true) . '%';
foreach ($words as $word)
{
if ($this->hasLength($word))
{
$search[] = '%' . $db->escape($word, true) . '%';
}
}
// Construct the LIKE clause with wildcards between each word for partial matches
@ -468,8 +478,11 @@ class GetbibleModelSearch extends ListModel
$words = $this->splitSentence($this->search);
foreach ($words as $word)
{
$search = $db->quote('%' . $db->escape($word, true) . '%');
$conditions[] = '( '.$case.' a.text LIKE ' . $search . ')';
if ($this->hasLength($word))
{
$search = $db->quote('%' . $db->escape($word, true) . '%');
$conditions[] = '( '.$case.' a.text LIKE ' . $search . ')';
}
}
}
// 1 = exact match
@ -478,8 +491,11 @@ class GetbibleModelSearch extends ListModel
$words = $this->splitSentence($this->search);
foreach ($words as $word)
{
$search = $case . ' a.text REGEXP '. $db->quote('[[:<:]]' . $db->escape($word, true) . '[[:>:]]');
$conditions[] = '( ' . $search . ')';
if ($this->hasLength($word))
{
$search = $case . ' a.text REGEXP '. $db->quote('[[:<:]]' . $db->escape($word, true) . '[[:>:]]');
$conditions[] = '( ' . $search . ')';
}
}
}
}

18
update_server.xml
View File

@ -521,4 +521,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.32</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.32.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>