standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-14 10:31:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Match Contributor UrlName to Identifier

Browse source 
Fixes #459
This commit is contained in:
Mike Colagrosso 2025-01-15 13:54:40 -07:00 • committed by Alex Cabal
parent 14cdd74585
commit 38f4e34a11
2 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/Contributor.php
View file

@ -83,14 +83,19 @@ class Contributor{
// Sometimes placeholders may have `'` in the name.
$this->Name = str_replace('\'', '’', $this->Name);
}
$this->UrlName = Formatter::MakeUrlSafe($this->Name);
}
else{
$error->Add(new Exceptions\ContributorNameRequiredException());
}
if(!isset($this->UrlName)){
if(isset($this->UrlName)){
$this->UrlName = trim($this->UrlName);
if($this->UrlName == ''){
$error->Add(new Exceptions\ContributorUrlNameRequiredException());
}
}
else{
$error->Add(new Exceptions\ContributorUrlNameRequiredException());
}

35
lib/Ebook.php
View file

@ -987,7 +987,7 @@ final class Ebook{
$contributor = new Contributor();
$contributor->Name = (string)$author;
$contributor->UrlName = Formatter::MakeUrlSafe($contributor->Name);
$contributor->UrlName = Ebook::MatchContributorUrlNameToIdentifier(Formatter::MakeUrlSafe($contributor->Name), $ebook->Identifier);
$contributor->SortName = $fileAs;
$contributor->FullName = Ebook::NullIfEmpty($xml->xpath('/package/metadata/meta[@property="se:name.person.full-name"][@refines="#' . $id . '"]'));
$contributor->WikipediaUrl = Ebook::NullIfEmpty($xml->xpath('/package/metadata/meta[@property="se:url.encyclopedia.wikipedia"][@refines="#' . $id . '"]'));
@ -1014,7 +1014,7 @@ final class Ebook{
foreach($xml->xpath('/package/metadata/meta[ (@property="role" or @property="se:role") and @refines="#' . $id . '"]') ?: [] as $role){
$c = new Contributor();
$c->Name = (string)$contributor;
$c->UrlName = Formatter::MakeUrlSafe($contributor->Name);
$c->UrlName = Ebook::MatchContributorUrlNameToIdentifier(Formatter::MakeUrlSafe($c->Name), $ebook->Identifier);
$c->SortName = Ebook::NullIfEmpty($xml->xpath('/package/metadata/meta[@property="file-as"][@refines="#' . $id . '"]'));
$c->FullName = Ebook::NullIfEmpty($xml->xpath('/package/metadata/meta[@property="se:name.person.full-name"][@refines="#' . $id . '"]'));
$c->WikipediaUrl = Ebook::NullIfEmpty($xml->xpath('/package/metadata/meta[@property="se:url.encyclopedia.wikipedia"][@refines="#' . $id . '"]'));
@ -1129,6 +1129,37 @@ final class Ebook{
return Db::Query('SELECT * from Ebooks where EbookId = ?', [$ebookId], Ebook::class)[0] ?? throw new Exceptions\EbookNotFoundException();
}
/**
* Find the matching URL name in the `Identifier` string. The `Identifier` has strings like `samuel-butler-1612-1680`, and should be the source of truth for a `Contributor` `UrlName`.
*
* Examples:
*
* $urlName = 'samuel-butler'
* $identifier = 'url:https://standardebooks.org/ebooks/samuel-butler-1612-1680/hudibras'
* returns: 'samuel-butler-1612-1680'
*
* $urlName = 'william-wordsworth'
* $identifier = 'url:https://standardebooks.org/ebooks/william-wordsworth_samuel-taylor-coleridge/lyrical-ballads'
* returns: 'william-wordsworth'
*
* $urlName = 'aylmer-maude'
* $identifier = 'url:https://standardebooks.org/ebooks/leo-tolstoy/the-power-of-darkness/louise-maude_aylmer-maude'
* returns: 'aylmer-maude'
*
* $urlName = 'leonard-welsted' // Elided from the Identifier with et-al.
* $identifier = 'url:https://standardebooks.org/ebooks/ovid/metamorphoses/john-dryden_joseph-addison_laurence-eusden_arthur-maynwaring_samuel-croxall_nahum-tate_william-stonestreet_thomas-vernon_john-gay_alexander-pope_stephen-harvey_william-congreve_et-al'
* returns: 'leonard-welsted' // Returns original input when there is no match.
*
*/
protected static function MatchContributorUrlNameToIdentifier(string $urlName, string $identifier): string{
if(preg_match('|' . $urlName . '[^\/_]*|ius', $identifier, $matches)){
return $matches[0];
}
else{
return $urlName;
}
}
/**
* Joins the `Name` properites of `Contributor` objects as a URL slug, e.g.,
*