standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-12 09:32:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix iconv bug with apostrophes

Browse source
This commit is contained in:
Alex Cabal 2019-01-18 13:40:02 -06:00
parent c879dcab34
commit 5939195955
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Ebook.php
View file

@ -148,7 +148,7 @@ class Ebook{
$this->Timestamp = new \DateTime((string)$xml->xpath('/package/metadata/dc:date')[0]); $this->Timestamp = new \DateTime((string)$xml->xpath('/package/metadata/dc:date')[0]);
// Get SE tags // Get SE tags
foreach($xml->xpath('/package/metadata/meta[@property="meta-auth"]') ?: [] as $tag){ foreach($xml->xpath('/package/metadata/meta[@property="se:subject"]') ?: [] as $tag){
$this->Tags[] = (string)$tag; $this->Tags[] = (string)$tag;
} }
@ -335,6 +335,7 @@ class Ebook{
} }
// Remove diacritics and non-alphanumeric characters // Remove diacritics and non-alphanumeric characters
$searchString = str_replace(['‘,', '’'], '', $searchString);
$searchString = trim(preg_replace('|[^a-zA-Z0-9 ]|ius', ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $searchString) ?: '') ?? ''); $searchString = trim(preg_replace('|[^a-zA-Z0-9 ]|ius', ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $searchString) ?: '') ?? '');
$query = trim(preg_replace('|[^a-zA-Z0-9 ]|ius', ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $query) ?: '') ?? ''); $query = trim(preg_replace('|[^a-zA-Z0-9 ]|ius', ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $query) ?: '') ?? '');

7
lib/Formatter.php
View file

@ -1,15 +1,16 @@
<? <?
class Formatter{ class Formatter{
public static function MakeUrlSafe(string $text): string{ public static function MakeUrlSafe(string $text): string{
// Remove apostrophes
// We have to do this first so iconv doesn't choke
$text = str_replace(['\'', '‘,', '’'], '', $text);
// Remove accent characters // Remove accent characters
$text = iconv('UTF-8', 'ASCII//TRANSLIT', $text) ?: ''; $text = iconv('UTF-8', 'ASCII//TRANSLIT', $text) ?: '';
// Trim and convert to lowercase // Trim and convert to lowercase
$text = mb_strtolower(trim($text)); $text = mb_strtolower(trim($text));
// Remove apostrophes
$text = preg_replace("/['’]/ius", '', $text) ?: '';
// Then convert any non-digit, non-letter character to a space // Then convert any non-digit, non-letter character to a space
$text = preg_replace('/[^0-9a-zA-Z]/ius', ' ', $text) ?: ''; $text = preg_replace('/[^0-9a-zA-Z]/ius', ' ', $text) ?: '';