mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Fixes for retriever

Browse source
This commit is contained in:
Matthew Exon 2019-07-20 10:44:38 +01:00 committed by Matthew Exon
parent b994de3308
commit f453c15259
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
retriever/retriever.php
View file

@ -512,7 +512,8 @@ function retriever_apply_xslt_text($xslt_text, $doc) {
function retriever_apply_dom_filter($retriever, &$item, $resource) { function retriever_apply_dom_filter($retriever, &$item, $resource) {
logger('retriever_apply_dom_filter: applying XSLT to ' . $item['id'] . ' ' . $item['uri'] . ' contact ' . $item['contact-id'], LOGGER_DEBUG); logger('retriever_apply_dom_filter: applying XSLT to ' . $item['id'] . ' ' . $item['uri'] . ' contact ' . $item['contact-id'], LOGGER_DEBUG);
if (!$retriever['data']['include'] && !$retriever['data']['customxslt']) { if (!array_key_exists('include', $retriever['data']) && !array_key_exists('customxslt', $retriever['data'])) {
logger('retriever_apply_dom_filter: no include and no customxslt', LOGGER_INFO);
return; return;
} }
if (!$resource['data']) { if (!$resource['data']) {
@ -564,8 +565,8 @@ function retriever_apply_dom_filter($retriever, &$item, $resource) {
$item['body'] .= "\n\n" . L10n::t('Retrieved') . ' ' . date("Y-m-d") . ': [url='; $item['body'] .= "\n\n" . L10n::t('Retrieved') . ' ' . date("Y-m-d") . ': [url=';
$item['body'] .= $item['plink']; $item['body'] .= $item['plink'];
$item['body'] .= ']' . $item['plink'] . '[/url]'; $item['body'] .= ']' . $item['plink'] . '[/url]';
q("UPDATE `item` SET `body` = '%s' WHERE `id` = %d", DBA::update('item', ['body' => $item['body']], ['id' => $item['id']]);
DBA::escape($item['body']), intval($item['id'])); DBA::update('item-content', ['body' => $item['body']], ['uri' => $item['uri']]);
} }
function retrieve_images(&$item, $a) { function retrieve_images(&$item, $a) {
@ -642,9 +643,9 @@ function retriever_transform_images($a, &$item, $resource) {
logger('retriever_transform_images caught exception ' . $e->getMessage()); logger('retriever_transform_images caught exception ' . $e->getMessage());
return; return;
} }
foreach ($photo as $k => $v) if (!array_key_exists('full', $photo)) {
{ logger('retriever_transform_images: no replacement URL for image ' . $resource['url']);
logger('@@@ photo key ' . $k); return;
} }
$new_url = $photo['full']; $new_url = $photo['full'];
logger('retriever_transform_images: replacing ' . $resource['url'] . ' with ' . logger('retriever_transform_images: replacing ' . $resource['url'] . ' with ' .