X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FQueryPage.php;h=fb98bc68e64d2c5c6a40b331c763666ffb94e1cc;hb=8c3b4616cdf2bcd9c8cc1264b806c47b2523f163;hp=b7ff53985323856279f02551af4f3996b6d82219;hpb=af2177edfd9b108eca8598f9ace57672f0521942;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/QueryPage.php b/includes/QueryPage.php index b7ff539853..fb98bc68e6 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -1,50 +1,85 @@ listoutput; + * + * @param bool $bool + */ + function setListoutput( $bool ) { + $this->listoutput = $bool; + } /** * Subclasses return their name here. Make sure the name is also @@ -55,6 +90,15 @@ class QueryPage { return ''; } + /** + * Return title object representing this page + * + * @return Title + */ + function getTitle() { + return SpecialPage::getTitleFor( $this->getName() ); + } + /** * Subclasses return an SQL query here. * @@ -96,6 +140,18 @@ class QueryPage { return $wgDisableQueryPages; } + /** + * Whether or not the output of the page in question is retrived from + * the database cache. + * + * @return bool + */ + function isCached() { + global $wgMiserMode; + + return $this->isExpensive() && $wgMiserMode; + } + /** * Sometime we dont want to build rss / atom feeds. */ @@ -143,10 +199,10 @@ class QueryPage { /** * Clear the cache and save new results */ - function recache( $ignoreErrors = true ) { + function recache( $limit, $ignoreErrors = true ) { $fname = get_class($this) . '::recache'; - $dbw =& wfGetDB( DB_MASTER ); - $dbr =& wfGetDB( DB_SLAVE, array( $this->getName(), 'QueryPage::recache', 'vslow' ) ); + $dbw = wfGetDB( DB_MASTER ); + $dbr = wfGetDB( DB_SLAVE, array( $this->getName(), 'QueryPage::recache', 'vslow' ) ); if ( !$dbw || !$dbr ) { return false; } @@ -162,7 +218,8 @@ class QueryPage { $dbw->delete( 'querycache', array( 'qc_type' => $this->getName() ), $fname ); # Do query $sql = $this->getSQL() . $this->getOrder(); - $sql = $dbr->limitResult($sql, 1000,0); + if ($limit !== false) + $sql = $dbr->limitResult($sql, $limit, 0); $res = $dbr->query($sql, $fname); $num = false; if ( $res ) { @@ -204,6 +261,11 @@ class QueryPage { $dbw->ignoreErrors( $ignoreW ); $dbr->ignoreErrors( $ignoreR ); } + + # Update the querycache_info record for the page + $dbw->delete( 'querycache_info', array( 'qci_type' => $this->getName() ), $fname ); + $dbw->insert( 'querycache_info', array( 'qci_type' => $this->getName(), 'qci_timestamp' => $dbw->timestamp() ), $fname ); + } return $num; } @@ -217,27 +279,53 @@ class QueryPage { * @param $shownavigation show navigation like "next 200"? */ function doQuery( $offset, $limit, $shownavigation=true ) { - global $wgUser, $wgOut, $wgLang, $wgRequest, $wgContLang; - global $wgMiserMode; + global $wgUser, $wgOut, $wgLang, $wgContLang; + + $this->offset = $offset; + $this->limit = $limit; $sname = $this->getName(); $fname = get_class($this) . '::doQuery'; - $sql = $this->getSQL(); - $dbr =& wfGetDB( DB_SLAVE ); - $dbw =& wfGetDB( DB_MASTER ); - $querycache = $dbr->tableName( 'querycache' ); + $dbr = wfGetDB( DB_SLAVE ); $wgOut->setSyndicated( $this->isSyndicated() ); - if ( $this->isExpensive() ) { - // Disabled recache parameter due to retry problems -- TS - if( $wgMiserMode ) { - $type = $dbr->strencode( $sname ); - $sql = - "SELECT qc_type as type, qc_namespace as namespace,qc_title as title, qc_value as value - FROM $querycache WHERE qc_type='$type'"; - $wgOut->addWikiText( wfMsg( 'perfcached' ) ); + if ( !$this->isCached() ) { + $sql = $this->getSQL(); + } else { + # Get the cached result + $querycache = $dbr->tableName( 'querycache' ); + $type = $dbr->strencode( $sname ); + $sql = + "SELECT qc_type as type, qc_namespace as namespace,qc_title as title, qc_value as value + FROM $querycache WHERE qc_type='$type'"; + + if( !$this->listoutput ) { + + # Fetch the timestamp of this update + $tRes = $dbr->select( 'querycache_info', array( 'qci_timestamp' ), array( 'qci_type' => $type ), $fname ); + $tRow = $dbr->fetchObject( $tRes ); + + if( $tRow ) { + $updated = $wgLang->timeAndDate( $tRow->qci_timestamp, true, true ); + $cacheNotice = wfMsg( 'perfcachedts', $updated ); + $wgOut->addMeta( 'Data-Cache-Time', $tRow->qci_timestamp ); + $wgOut->addInlineScript( "var dataCacheTime = '{$tRow->qci_timestamp}';" ); + } else { + $cacheNotice = wfMsg( 'perfcached' ); + } + + $wgOut->addWikiText( $cacheNotice ); + + # If updates on this page have been disabled, let the user know + # that the data set won't be refreshed for now + global $wgDisableQueryPageUpdate; + if( is_array( $wgDisableQueryPageUpdate ) && in_array( $this->getName(), $wgDisableQueryPageUpdate ) ) { + $wgOut->addWikiText( wfMsg( 'querypage-no-updates' ) ); + } + } + } $sql .= $this->getOrder(); @@ -245,61 +333,126 @@ class QueryPage { $res = $dbr->query( $sql ); $num = $dbr->numRows($res); - $sk = $wgUser->getSkin( ); - - if($shownavigation) { - $wgOut->addHTML( $this->getPageHeader() ); - $top = wfShowingResults( $offset, $num); - $wgOut->addHTML( "
{$top}\n" );
-
- # often disable 'next' link when we reach the end
- if($num < $limit) { $atend = true; } else { $atend = false; }
-
- $sl = wfViewPrevNext( $offset, $limit ,
- $wgContLang->specialPage( $sname ),
- wfArrayToCGI( $this->linkParameters() ), $atend );
- $wgOut->addHTML( "
{$sl}
' . wfShowingResults( $offset, $num ) . '
' ); + # Disable the "next" link when we reach the end + $paging = wfViewPrevNext( $offset, $limit, $wgContLang->specialPage( $sname ), + wfArrayToCGI( $this->linkParameters() ), ( $num < $limit ) ); + $wgOut->addHtml( '' . $paging . '
' ); + } else { + # No results to show, so don't bother with "showing X of Y" etc. + # -- just let the user know and give up now + $wgOut->addHtml( '' . wfMsgHtml( 'specialpage-empty' ) . '
' ); + $wgOut->addHtml( XML::closeElement( 'div' ) ); + return; + } + } + + # The actual results; specialist subclasses will want to handle this + # with more than a straight list, so we hand them the info, plus + # an OutputPage, and let them get on with it + $this->outputResults( $wgOut, + $wgUser->getSkin(), + $dbr, # Should use a ResultWrapper for this + $res, + $dbr->numRows( $res ), + $offset ); + + # Repeat the paging links at the bottom + if( $shownavigation ) { + $wgOut->addHtml( '' . $paging . '
' ); } - if ( $num > 0 ) { - $s = "{$sl}
\n" ); - } - return $num; } + + function openList( $offset ) { + return "\n