Skip to content

Speed improvements #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bezumkin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Speed improvements #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 71 additions & 21 deletions core/components/googlesitemap/model/googlesitemap/googlesitemap.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,38 @@ public function run($currentParent,$selfId = -1,$depth = 0) {

/* get children */
$c = $this->getQuery($currentParent);
$children = $this->modx->getCollection('modResource',$c);
if ($c->prepare() && $c->stmt->execute()) {
$children = $c->stmt->fetchAll(PDO::FETCH_ASSOC);
}
else {
$children = array();
$this->modx->log(modX::LOG_LEVEL_ERROR, print_r($c->stmt->errorInfo(),true));
}

/** @var modResource $child */
/** @var array $child */
foreach ($children as $child) {
$id = $child->get('id');
$id = $child['id'];
if ($selfId == $id) continue;

$canParse = true;
if ($this->config['searchable']) {
$canParse = $canParse && $child->get('searchable');
$canParse = $canParse && $child['searchable'];
}
if ($this->config['published']) {
$canParse = $canParse && $child->get('published');
$canParse = $canParse && $child['published'];
}
if ($this->config['hideDeleted']) {
$canParse = $canParse && !$child->get('deleted');
$canParse = $canParse && !$child['deleted'];
}
if (empty($this->config['showHidden'])) {
$canParse = $canParse && (!$child->get('hidemenu') || $child->get('class_key') == 'Article');
$canParse = $canParse && (!$child['hidemenu'] || $child['class_key'] == 'Article' || $child['class_key'] == 'Ticket');
}

if ($canParse) {
$url = $this->modx->makeUrl($id,'','','full');

$date = $child->get('editedon') ? $child->get('editedon') : $child->get('createdon');
$date = date("Y-m-d", strtotime($date));
$date = $child['editedon'] ? $child['editedon'] : $child['createdon'];
$date = date("Y-m-d", $date);

/* Get the date difference */
$datediff = datediff("d", $date, date("Y-m-d"));
Expand All @@ -120,11 +126,8 @@ public function run($currentParent,$selfId = -1,$depth = 0) {
$priority = '0.25';
$update = 'monthly';
}
if (!empty($this->config['priorityTV'])) {
$priorityTV = $child->getTVValue($this->config['priorityTV']);
if (!empty($priorityTV)) {
$priority = $priorityTV;
}
if (!empty($child['priorityTV'])) {
$priority = $child['priorityTV'];
}
/* add item to output */
$output .= $this->getChunk($this->config['itemTpl'],array(
Expand All @@ -136,8 +139,8 @@ public function run($currentParent,$selfId = -1,$depth = 0) {
}

/* if children, recurse */
if ($child->get('children') > 0) {
$output .= $this->run($child->get('id'),$selfId,$depth+1);
if ($child['children'] > 0) {
$output .= $this->run($child['id'],$selfId,$depth+1);
}
}
return $output;
Expand All @@ -147,14 +150,35 @@ public function getQuery($currentParent) {
/* build query */
$c = $this->modx->newQuery('modResource');
$c->leftJoin('modResource','Children');
$c->select($this->modx->getSelectColumns('modResource','modResource'));
$c->select($this->modx->getSelectColumns('modResource','modResource','',array('content'),true));
$c->select(array(
'COUNT(Children.id) AS children',
));
$c->where(array(
'parent' => $currentParent,
));

/* if using priorityTV */
if (!empty($this->config['priorityTV'])) {
$tv = trim($this->config['priorityTV']);
if (is_numeric($tv)) {
$c->leftJoin('modTemplateVarResource', 'modTemplateVarResource', array(
'`modTemplateVarResource`.`tmplvarid` = '.$tv,
'`modTemplateVarResource`.`contentid` = `modResource`.`id`'
));
}
else {
$c->leftJoin('modTemplateVar', 'modTemplateVar', array(
'`modTemplateVar`.`name` = "'.$tv.'"',
));
$c->leftJoin('modTemplateVarResource', 'modTemplateVarResource', array(
'`modTemplateVarResource`.`tmplvarid` = `modTemplateVar`.`id`',
'`modTemplateVarResource`.`contentid` = `modResource`.`id`',
));
}
$c->select('`modTemplateVarResource`.`value` as `priorityTV`');
}

/* if restricting to contexts */
if (!empty($this->config['context'])) {
$ctxs = $this->prepareForIn($this->config['context']);
Expand Down Expand Up @@ -244,11 +268,14 @@ public function getChunk($name,$properties = array()) {
if ($chunk == false) return false;
}
$this->chunks[$name] = $chunk->getContent();
} else {
$o = $this->chunks[$name];
$chunk = $this->modx->newObject('modChunk');
$chunk->setContent($o);
}
$pls = $this->makePlaceholders($properties);
$tmp = $this->chunks[$name];
$content = str_replace($pls['pl'], $pls['vl'], $tmp);

/* @var modChunk $chunk */
$chunk = $this->modx->newObject('modChunk');
$chunk->setContent($content);
$chunk->setCacheable(false);
return $chunk->process($properties);
}
Expand All @@ -274,6 +301,29 @@ private function _getTplChunk($name,$postFix = '.chunk.tpl') {
}
return $chunk;
}

/**
* Prepares data for replacement in chunk
*
* @param array $properties Array with keys and values
* @return array $result Two nested arrays with placeholders and values
*/
public function makePlaceholders(array $properties = array(), $prefix = '') {
$result = array(
'pl' => array(),
'vl' => array()
);
foreach ($properties as $k => $v) {
if (is_array($v)) {
$result = array_merge_recursive($result, $this->makePlaceholders($v, $k.'.'));
}
else {
$result['pl'][$prefix.$k] = '[[+'.$prefix.$k.']]';
$result['vl'][$prefix.$k] = $v;
}
}
return $result;
}
}


Expand Down