$this->fld_size = isset($prop['size']);
$this->fld_sha1 = isset($prop['sha1']);
$this->fld_metadata = isset($prop['metadata']);
+ $this->fld_archivename = isset($prop['archivename']);
if($params['urlheight'] != -1 && $params['urlwidth'] == -1)
$this->dieUsage("iiurlheight cannot be used without iiurlwidth", 'iiurlwidth');
}
// Now get the old revisions
- if($params['limit'] > 1) {
- $oldies = $img->getHistory($params['limit'] - 1, $params['start'], $params['end']);
- if(!empty($oldies))
- foreach($oldies as $oldie)
- $data[] = $this->getInfo($oldie);
+ // Get one more to facilitate query-continue functionality
+ $count = count($data);
+ $oldies = $img->getHistory($params['limit'] - $count + 1, $params['start'], $params['end']);
+ foreach($oldies as $oldie) {
+ if(++$count > $params['limit']) {
+ // We've reached the extra one which shows that there are additional pages to be had. Stop here...
+ // Only set a query-continue if there was only one title
+ if(count($pageIds[NS_IMAGE]) == 1)
+ $this->setContinueEnumParameter('start', $oldie->getTimestamp());
+ break;
+ }
+ $data[] = $this->getInfo($oldie);
}
}
$vals['anon'] = '';
}
if($this->fld_size) {
- $vals['size'] = $f->getSize();
- $vals['width'] = $f->getWidth();
- $vals['height'] = $f->getHeight();
+ $vals['size'] = intval($f->getSize());
+ $vals['width'] = intval($f->getWidth());
+ $vals['height'] = intval($f->getHeight());
}
if($this->fld_url) {
if($this->scale && !$f->isOld()) {
$vals['metadata'] = $metadata ? $metadata : null;
$this->getResult()->setIndexedTagName_recursive($vals['metadata'], 'meta');
}
+ if($this->fld_archivename && $f->isOld())
+ $vals['archivename'] = $f->getArchiveName();
+
return $vals;
}
'url',
'size',
'sha1',
- 'metadata'
+ 'metadata',
+ 'archivename'
)
),
'limit' => array(