X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FQueryPage.php;h=2371444aba2348124d9ffb6e7dcbc15edb6c366d;hb=ce335a08902456a66726ab7ac092fa466e3918fc;hp=027df13741a28ecc850ffb8e00aa5019f2c4c96c;hpb=9194bdac2ecf238520ebdd7d8b276f4bc6e4b061;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 027df13741..2371444aba 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Contain a class for special pages
+ * @package MediaWiki
  */
 
 /**
@@ -8,11 +9,37 @@
  */
 require_once ( 'Feed.php' );
 
+/**
+ * List of query page classes and their associated special pages, for periodic update purposes
+ */
+$wgQueryPages = array(
+//         QueryPage subclass           Special page name
+//------------------------------------------------------------
+    array( 'AncientPagesPage',          'Ancientpages'      ),
+    array( 'BrokenRedirectsPage',       'BrokenRedirects'   ),
+    array( 'DeadendPagesPage',          'Deadendpages'      ),
+    array( 'DisambiguationsPage',       'Disambiguations'   ),
+    array( 'DoubleRedirectsPage',       'DoubleRedirects'   ),
+    array( 'ListUsersPage',             'Listusers'         ), 
+    array( 'LonelyPagesPage',           'Lonelypages'       ),
+    array( 'LongPagesPage',             'Longpages'         ),
+    array( 'NewPagesPage',              'Newpages'          ),
+    array( 'PopularPagesPage',          'Popularpages'      ),
+    array( 'ShortPagesPage',            'Shortpages'        ),
+    array( 'UncategorizedCategoriesPage','Uncategorizedcategories'),
+    array( 'UncategorizedPagesPage',    'Uncategorizedpages'),
+    array( 'UnusedimagesPage',          'Unusedimages'      ),
+    array( 'WantedPagesPage',           'Wantedpages'       ),
+);
+    
+
+
 /**
  * This is a class for doing query pages; since they're almost all the same,
  * we factor out some of the functionality into a superclass, and let
  * subclasses derive from it.
  *
+ * @package MediaWiki
  */
 class QueryPage {
 
@@ -66,10 +93,18 @@ class QueryPage {
 		return $wgDisableQueryPages;
 	}
 
+	/**
+	 * Sometime we dont want to build rss / atom feeds.
+	 */
+	function isSyndicated() {
+		return true;
+	}
+
 	/**
 	 * Formats the results of the query for display. The skin is the current
 	 * skin; you can use it for making links. The result is a single row of
 	 * result data. You should be able to grab SQL results off of it.
+	 * If the function return "false", the line output will be skipped.
 	 */
 	function formatResult( $skin, $result ) {
 		return '';
@@ -77,10 +112,96 @@ 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.
+	 * Setting this to return true, will call one more time wfFormatResult to
+	 * be sure that the very last result is formatted and shown.
+	 */
+	function tryLastResult( ) {
+		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
@@ -88,9 +209,10 @@ class QueryPage {
 	 *
 	 * @param $offset database query offset
 	 * @param $limit database query limit
+	 * @param $shownavigation show navigation like "next 200"?
 	 */
-	function doQuery( $offset, $limit ) {
-		global $wgUser, $wgOut, $wgLang, $wgRequest;
+	function doQuery( $offset, $limit, $shownavigation=true ) {
+		global $wgUser, $wgOut, $wgLang, $wgRequest, $wgContLang;
 		global $wgMiserMode;
 
 		$sname = $this->getName();
@@ -100,89 +222,70 @@ class QueryPage {
 		$dbw =& wfGetDB( DB_MASTER );
 		$querycache = $dbr->tableName( 'querycache' );
 
-		$wgOut->setSyndicated( true );
-		$res = false;
+		$wgOut->setSyndicated( $this->isSyndicated() );
 
 		if ( $this->isExpensive() ) {
-			$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
-				$maxstored = 1000;
-				$res = $dbr->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 .= ',';
-					}
-					$insertSql .= '(' .
-						$dbw->addQuotes( $row->type ) . ',' .
-						$dbw->addQuotes( $row->namespace ) . ',' .
-						$dbw->addQuotes( $row->title ) . ',' .
-						$dbw->addQuotes( $row->value ) . ')';
-				}
-
-				# Save results into the querycache table on the master
-				$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 ) {
+			// 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'";
-			}
-			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 , $wgLang->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'>";
+
+			# Only read at most $num rows, because $res may contain the whole 1000
+			for ( $i = 0; $i < $num && $obj = $dbr->fetchObject( $res ); $i++ ) {
+				$format = $this->formatResult( $sk, $obj );
+				if ( $format ) {
+					$attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
+										$obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
+					$s .= "<li{$attr}>{$format}</li>\n";
+				}
+			}
 
-		$s = "<ol start='" . ( $offset + 1 ) . "' class='special'>";
-		# Only read at most $num rows, because $res may contain the whole 1000
-		for ( $i = 0; $i < $num && $obj = $dbr->fetchObject( $res ); $i++ ) {
-			$format = $this->formatResult( $sk, $obj );
-			$attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
-			          $obj->patrolled == 0 ) ? ' class="not_patrolled"' : '';
-			$s .= "<li{$attr}>{$format}</li>\n";
+			if($this->tryLastResult()) {
+				// flush the very last result
+				$obj = null;
+				$format = $this->formatResult( $sk, $obj );
+				if( $format ) {
+					$attr = ( isset ( $obj->usepatrol ) && $obj->usepatrol &&
+										$obj->patrolled == 0 ) ? ' class="not-patrolled"' : '';
+					$s .= "<li{$attr}>{$format}</li>\n";
+				}
+			}
+			
+			$dbr->freeResult( $res );
+			$s .= '</ol>';
+			$wgOut->addHTML( $s );
 		}
-		$dbr->freeResult( $res );
-		$s .= '</ol>';
-		$wgOut->addHTML( $s );
-		$wgOut->addHTML( "<p>{$sl}</p>\n" );
+		if($shownavigation) {
+			$wgOut->addHTML( "<p>{$sl}</p>\n" );
+		}
+		return $num;
 	}
 
 	/**
@@ -237,7 +340,7 @@ class QueryPage {
 			}
 
 			return new FeedItem(
-				$title->getText(),
+				$title->getPrefixedText(),
 				$this->feedItemDesc( $row ),
 				$title->getFullURL(),
 				$date,
@@ -249,18 +352,9 @@ class QueryPage {
 	}
 
 	function feedItemDesc( $row ) {
-		$text = '';
-		if( isset( $row->comment ) ) {
-			$text = htmlspecialchars( $row->comment );
-		} else {
-			$text = '';
-		}
-
-		if( isset( $row->text ) ) {
-			$text = '<p>' . htmlspecialchars( wfMsg( 'summary' ) ) . ': ' . $text . "</p>\n<hr />\n<div>" .
-				nl2br( htmlspecialchars( $row->text ) ) . "</div>";;
-		}
-		return $text;
+		return isset( $row->comment )
+			? htmlspecialchars( $row->comment )
+			: '';
 	}
 
 	function feedItemAuthor( $row ) {
@@ -293,12 +387,15 @@ class QueryPage {
  * This is a subclass for very simple queries that are just looking for page
  * titles that match some criteria. It formats each result item as a link to
  * that page.
+ *
+ * @package MediaWiki
  */
 class PageQueryPage extends QueryPage {
 
 	function formatResult( $skin, $result ) {
+		global $wgContLang;
 		$nt = Title::makeTitle( $result->namespace, $result->title );
-		return $skin->makeKnownLinkObj( $nt, '' );
+		return $skin->makeKnownLinkObj( $nt, $wgContLang->convert( $nt->getPrefixedText() ) );
 	}
 }