* Fixed unclosed <p> tag
[lhc/web/wiklou.git] / includes / QueryPage.php
index 925083e..8c6e110 100644 (file)
@@ -24,7 +24,6 @@ $wgQueryPages = array(
     array( 'LonelyPagesPage',           'Lonelypages'       ),
     array( 'LongPagesPage',             'Longpages'         ),
     array( 'NewPagesPage',              'Newpages'          ),
-    array( 'PopularPagesPage',          'Popularpages'      ),
     array( 'ShortPagesPage',            'Shortpages'        ),
     array( 'UncategorizedCategoriesPage','Uncategorizedcategories'),
     array( 'UncategorizedPagesPage',    'Uncategorizedpages'),
@@ -32,7 +31,10 @@ $wgQueryPages = array(
     array( 'WantedPagesPage',           'Wantedpages'       ),
 );
     
-
+global $wgDisableCounters;
+if( !$wgDisableCounters ) {
+       $wgQueryPages[] = array( 'PopularPagesPage',          'Popularpages'      );
+}
 
 /**
  * This is a class for doing query pages; since they're almost all the same,
@@ -112,11 +114,21 @@ class QueryPage {
 
        /**
         * The content returned by this function will be output before any result
-       */
+        */
        function getPageHeader( ) {
                return '';
        }
        
+       /**
+        * If using extra form wheely-dealies, return a set of parameters here
+        * as an associative array. They will be encoded and added to the paging
+        * links (prev/next/lengths).
+        * @return array
+        */
+       function linkParameters() {
+               return array();
+       }
+       
        /**
         * Some special pages (for example SpecialListusers) might not return the
         * current object formatted, but return the previous one instead.
@@ -127,14 +139,81 @@ class QueryPage {
                return false;
        }
 
+       /**
+        * Clear the cache and save new results
+        */
+       function recache( $ignoreErrors = true ) {
+               $fname = get_class($this) . '::recache';
+               $dbw =& wfGetDB( DB_MASTER );
+               $dbr =& wfGetDB( DB_SLAVE, array( $this->getName(), 'QueryPage::recache', 'vslow' ) );
+               if ( !$dbw || !$dbr ) {
+                       return false;
+               }
+
+               $querycache = $dbr->tableName( 'querycache' );
+               
+               if ( $ignoreErrors ) {
+                       $ignoreW = $dbw->ignoreErrors( true );
+                       $ignoreR = $dbr->ignoreErrors( true );
+               }
+
+               # Clear out any old cached data
+               $dbw->delete( 'querycache', array( 'qc_type' => $this->getName() ), $fname );
+               # Do query
+               $res = $dbr->query( $this->getSQL() . $this->getOrder() . $dbr->limitResult( 1000,0 ), $fname );
+               $num = false;
+               if ( $res ) {
+                       $num = $dbr->numRows( $res );
+                       # Fetch results
+                       $insertSql = "INSERT INTO $querycache (qc_type,qc_namespace,qc_title,qc_value) VALUES ";
+                       $first = true;
+                       while ( $res && $row = $dbr->fetchObject( $res ) ) {
+                               if ( $first ) {
+                                       $first = false;
+                               } else {
+                                       $insertSql .= ',';
+                               }
+                               if ( isset( $row->value ) ) {
+                                       $value = $row->value;
+                               } else {
+                                       $value = '';
+                               }
+
+                               $insertSql .= '(' .
+                                       $dbw->addQuotes( $row->type ) . ',' .
+                                       $dbw->addQuotes( $row->namespace ) . ',' .
+                                       $dbw->addQuotes( $row->title ) . ',' .
+                                       $dbw->addQuotes( $value ) . ')';
+                       }
+
+                       # Save results into the querycache table on the master
+                       if ( !$first ) {
+                               if ( !$dbw->query( $insertSql, $fname ) ) {
+                                       // Set result to false to indicate error
+                                       $dbr->freeResult( $res );
+                                       $res = false;
+                               }
+                       }
+                       if ( $res ) {
+                               $dbr->freeResult( $res );
+                       }
+                       if ( $ignoreErrors ) {
+                               $dbw->ignoreErrors( $ignoreW );
+                               $dbr->ignoreErrors( $ignoreR );
+                       }
+               }
+               return $num;
+       }
+
        /**
         * This is the actual workhorse. It does everything needed to make a
         * real, honest-to-gosh query page.
         *
         * @param $offset database query offset
         * @param $limit database query limit
+        * @param $shownavigation show navigation like "next 200"?
         */
-       function doQuery( $offset, $limit, $recache = false ) {
+       function doQuery( $offset, $limit, $shownavigation=true ) {
                global $wgUser, $wgOut, $wgLang, $wgRequest, $wgContLang;
                global $wgMiserMode;
 
@@ -146,86 +225,37 @@ class QueryPage {
                $querycache = $dbr->tableName( 'querycache' );
 
                $wgOut->setSyndicated( $this->isSyndicated() );
-               $res = false;
 
                if ( $this->isExpensive() ) {
                        // Disabled recache parameter due to retry problems -- TS
-                       // $recache = $wgRequest->getBool( 'recache' );
-
-                       if( $recache ) {
-                               # Clear out any old cached data
-                               $dbw->delete( 'querycache', array( 'qc_type' => $sname ), $fname );
-
-                               # Do query on the (possibly out of date) slave server
-                               $slowDB =& wfGetDB( DB_SLAVE, array( $this->getName(), 'QueryPage-recache', 'vslow' ) );
-                               $maxstored = 1000;
-                               $res = $slowDB->query( $sql . $this->getOrder() . $dbr->limitResult( $maxstored,0 ), $fname );
-
-                               # Fetch results
-                               $insertSql = "INSERT INTO $querycache (qc_type,qc_namespace,qc_title,qc_value) VALUES ";
-                               $first = true;
-                               while ( $row = $dbr->fetchObject( $res ) ) {
-                                       if ( $first ) {
-                                               $first = false;
-                                       } else {
-                                               $insertSql .= ',';
-                                       }
-                                       if ( isset( $row->value ) ) {
-                                               $value = $row->value;
-                                       } else {
-                                               $value = '';
-                                       }
-
-                                       $insertSql .= '(' .
-                                               $dbw->addQuotes( $row->type ) . ',' .
-                                               $dbw->addQuotes( $row->namespace ) . ',' .
-                                               $dbw->addQuotes( $row->title ) . ',' .
-                                               $dbw->addQuotes( $value ) . ')';
-                               }
-
-                               # Save results into the querycache table on the master
-                               if ( !$first ) {
-                                       $dbw->query( $insertSql, $fname );
-                               }
-
-                               # Set result pointer to allow reading for display
-                               $numRows = $dbr->numRows( $res );
-                               if ( $numRows <= $offset ) {
-                                       $num = 0;
-                               } else {
-                                       $dbr->dataSeek( $res, $offset );
-                                       $num = max( $limit, $numRows - $offset );
-                               }
-                       }
-                       if( $wgMiserMode || $recache ) {
+                       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'";
-                       }
-                       if( $wgMiserMode ) {
                                $wgOut->addWikiText( wfMsg( 'perfcached' ) );
                        }
                }
-               if ( $res === false ) {
-                       $res = $dbr->query( $sql . $this->getOrder() .
-                                           $dbr->limitResult( $limit,$offset ), $fname );
-                       $num = $dbr->numRows($res);
-               }
-
+               
+               $res = $dbr->query( $sql . $this->getOrder() .
+                                   $dbr->limitResult( $limit,$offset ), $fname );
+               $num = $dbr->numRows($res);
+               
                $sk = $wgUser->getSkin( );
 
-               $wgOut->addHTML( $this->getPageHeader() );
-
-               $top = wfShowingResults( $offset, $num);
-               $wgOut->addHTML( "<p>{$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 ), "" ,$atend );
-               $wgOut->addHTML( "<br />{$sl}</p>\n" );
-
+               if($shownavigation) {
+                       $wgOut->addHTML( $this->getPageHeader() );
+                       $top = wfShowingResults( $offset, $num);
+                       $wgOut->addHTML( "<p>{$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( "<br />{$sl}</p>\n" );
+               }
                if ( $num > 0 ) {
                        $s = "<ol start='" . ( $offset + 1 ) . "' class='special'>";
 
@@ -254,7 +284,9 @@ class QueryPage {
                        $s .= '</ol>';
                        $wgOut->addHTML( $s );
                }
-               $wgOut->addHTML( "<p>{$sl}</p>\n" );
+               if($shownavigation) {
+                       $wgOut->addHTML( "<p>{$sl}</p>\n" );
+               }
                return $num;
        }
 
@@ -365,7 +397,7 @@ class PageQueryPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgContLang;
                $nt = Title::makeTitle( $result->namespace, $result->title );
-               return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $result->title ) );
+               return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $nt->getPrefixedText() ) );
        }
 }