import_author_zot() - check for both hubloc and xchan entries. This should catch and repair entries which were subject to transient storage failures.
This commit is contained in:
parent
29596d12e3
commit
4a49643bcd
@ -3578,21 +3578,30 @@ function get_rpost_path($observer) {
|
|||||||
|
|
||||||
function import_author_zot($x) {
|
function import_author_zot($x) {
|
||||||
|
|
||||||
|
// Check that we have both a hubloc and xchan record - as occasionally storage calls will fail and
|
||||||
|
// we may only end up with one; which results in posts with no author name or photo and are a bit
|
||||||
|
// of a hassle to repair. If either or both are missing, do a full discovery probe.
|
||||||
|
|
||||||
$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
|
$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
|
||||||
$r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
|
$r1 = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
|
||||||
dbesc($x['guid']),
|
dbesc($x['guid']),
|
||||||
dbesc($x['guid_sig'])
|
dbesc($x['guid_sig'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($r) {
|
$r2 = q("select xchan_hash from xchan where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1",
|
||||||
logger('import_author_zot: in cache', LOGGER_DEBUG);
|
dbesc($x['guid']),
|
||||||
|
dbesc($x['guid_sig'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if($r1 && $r2) {
|
||||||
|
logger('in cache', LOGGER_DEBUG);
|
||||||
return $hash;
|
return $hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('import_author_zot: entry not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
|
logger('not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
|
||||||
|
|
||||||
$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
|
$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
|
||||||
if (zot_refresh($them))
|
if(zot_refresh($them))
|
||||||
return $hash;
|
return $hash;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user