MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Poco: added caching

Browse source
This commit is contained in:
Michael Vogel 2015-07-25 12:05:27 +02:00
parent 68e318e316
commit dcfcd6f906
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mod/poco.php
View file

@ -98,10 +98,11 @@ function poco_init(&$a) {
$startIndex = 0; $startIndex = 0;
$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults); $itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
if ($global) { if ($global) {
logger("Start global query", LOGGER_DEBUG);
//$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d", //$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d",
$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s', '%1', '%1') and `updated` > `last_failure` LIMIT %d, %d", $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
ORDER BY `updated` DESC LIMIT %d, %d",
dbesc($update_limit), dbesc($update_limit),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
@ -110,6 +111,7 @@ function poco_init(&$a) {
intval($itemsPerPage) intval($itemsPerPage)
); );
} elseif($system_mode) { } elseif($system_mode) {
logger("Start system mode query", LOGGER_DEBUG);
$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender`, $r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender`,
`profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`, `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry` `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`, `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`
FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
@ -124,6 +126,7 @@ function poco_init(&$a) {
intval($itemsPerPage) intval($itemsPerPage)
); );
} else { } else {
logger("Start query for user ".$user['nickname'], LOGGER_DEBUG);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`) AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d", AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
@ -136,6 +139,7 @@ function poco_init(&$a) {
intval($itemsPerPage) intval($itemsPerPage)
); );
} }
logger("Query done", LOGGER_DEBUG);
$ret = array(); $ret = array();
if(x($_GET,'sorted')) if(x($_GET,'sorted'))
@ -216,13 +220,19 @@ function poco_init(&$a) {
if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) if (($rr['keywords'] == "") AND isset($rr['pub_keywords']))
$rr['keywords'] = $rr['pub_keywords']; $rr['keywords'] = $rr['pub_keywords'];
$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
if (is_null($about)) {
$about = bbcode($rr['about'], false, false);
Cache::set("about:".$rr['updated'].":".$rr['nurl'],$about);
}
$entry = array(); $entry = array();
if($fields_ret['id']) if($fields_ret['id'])
$entry['id'] = (int)$rr['id']; $entry['id'] = (int)$rr['id'];
if($fields_ret['displayName']) if($fields_ret['displayName'])
$entry['displayName'] = $rr['name']; $entry['displayName'] = $rr['name'];
if($fields_ret['aboutMe']) if($fields_ret['aboutMe'])
$entry['aboutMe'] = bbcode($rr['about'], false, false); $entry['aboutMe'] = $about;
if($fields_ret['currentLocation']) if($fields_ret['currentLocation'])
$entry['currentLocation'] = $rr['location']; $entry['currentLocation'] = $rr['location'];
if($fields_ret['gender']) if($fields_ret['gender'])
@ -305,6 +315,8 @@ function poco_init(&$a) {
else else
http_status_exit(500); http_status_exit(500);
logger("End of poco", LOGGER_DEBUG);
if($format === 'xml') { if($format === 'xml') {
header('Content-type: text/xml'); header('Content-type: text/xml');
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret))); echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));