1 files changed, 48 insertions, 29 deletions

diff --git a/includes/Export.php b/includes/Export.php
index da92694e..aa70e27b 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -16,46 +16,43 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
+
 /**
  *
  * @package MediaWiki
  * @subpackage SpecialPage
  */
 
-/** */
-
-define( 'MW_EXPORT_FULL',     0 );
-define( 'MW_EXPORT_CURRENT',  1 );
-
-define( 'MW_EXPORT_BUFFER',   0 );
-define( 'MW_EXPORT_STREAM',   1 );
-
-define( 'MW_EXPORT_TEXT',     0 );
-define( 'MW_EXPORT_STUB',     1 );
-
-
-/**
- * @package MediaWiki
- * @subpackage SpecialPage
- */
 class WikiExporter {
-	
 	var $list_authors = false ; # Return distinct author list (when not returning full history)
 	var $author_list = "" ;
 	
+	const FULL = 0;
+	const CURRENT = 1;
+
+	const BUFFER = 0;
+	const STREAM = 1;
+
+	const TEXT = 0;
+	const STUB = 1;
+
 	/**
-	 * If using MW_EXPORT_STREAM to stream a large amount of data,
+	 * If using WikiExporter::STREAM to stream a large amount of data,
 	 * provide a database connection which is not managed by
 	 * LoadBalancer to read from: some history blob types will
 	 * make additional queries to pull source data while the
 	 * main query is still running.
 	 *
 	 * @param Database $db
-	 * @param int $history one of MW_EXPORT_FULL or MW_EXPORT_CURRENT
-	 * @param int $buffer one of MW_EXPORT_BUFFER or MW_EXPORT_STREAM
+	 * @param mixed $history one of WikiExporter::FULL or WikiExporter::CURRENT, or an 
+	 *                       associative array:
+	 *                         offset: non-inclusive offset at which to start the query
+	 *                         limit: maximum number of rows to return
+	 *                         dir: "asc" or "desc" timestamp order
+	 * @param int $buffer one of WikiExporter::BUFFER or WikiExporter::STREAM
 	 */
-	function WikiExporter( &$db, $history = MW_EXPORT_CURRENT,
-			$buffer = MW_EXPORT_BUFFER, $text = MW_EXPORT_TEXT ) {
+	function WikiExporter( &$db, $history = WikiExporter::CURRENT,
+			$buffer = WikiExporter::BUFFER, $text = WikiExporter::TEXT ) {
 		$this->db =& $db;
 		$this->history = $history;
 		$this->buffer  = $buffer;
@@ -168,20 +165,42 @@ class WikiExporter {
 		$revision = $this->db->tableName( 'revision' );
 		$text     = $this->db->tableName( 'text' );
 		
-		if( $this->history == MW_EXPORT_FULL ) {
+		$order = 'ORDER BY page_id';
+		$limit = '';
+		
+		if( $this->history == WikiExporter::FULL ) {
 			$join = 'page_id=rev_page';
-		} elseif( $this->history == MW_EXPORT_CURRENT ) {
+		} elseif( $this->history == WikiExporter::CURRENT ) {
 			if ( $this->list_authors && $cond != '' )  { // List authors, if so desired
 				$this->do_list_authors ( $page , $revision , $cond );
 			}
 			$join = 'page_id=rev_page AND page_latest=rev_id';
+		} elseif ( is_array( $this->history ) ) {
+			$join = 'page_id=rev_page';
+			if ( $this->history['dir'] == 'asc' ) {
+				$op = '>';
+				$order .= ', rev_timestamp';
+			} else {
+				$op = '<';
+				$order .= ', rev_timestamp DESC';
+			}
+			if ( !empty( $this->history['offset'] ) ) {
+				$join .= " AND rev_timestamp $op " . $this->db->addQuotes( 
+					$this->db->timestamp( $this->history['offset'] ) );
+			}
+			if ( !empty( $this->history['limit'] ) ) {
+				$limitNum = intval( $this->history['limit'] );
+				if ( $limitNum > 0 ) {
+					$limit = "LIMIT $limitNum";
+				}
+			}
 		} else {
 			wfProfileOut( $fname );
 			return new WikiError( "$fname given invalid history dump type." );
 		}
 		$where = ( $cond == '' ) ? '' : "$cond AND";
 
-		if( $this->buffer == MW_EXPORT_STREAM ) {
+		if( $this->buffer == WikiExporter::STREAM ) {
 			$prev = $this->db->bufferResults( false );
 		}
 		if( $cond == '' ) {
@@ -193,19 +212,19 @@ class WikiExporter {
 			$revindex = '';
 			$straight = '';
 		}
-		if( $this->text == MW_EXPORT_STUB ) {
+		if( $this->text == WikiExporter::STUB ) {
 			$sql = "SELECT $straight * FROM
 					$page $pageindex,
 					$revision $revindex
 					WHERE $where $join
-					ORDER BY page_id";
+					$order $limit";
 		} else {
 			$sql = "SELECT $straight * FROM
 					$page $pageindex,
 					$revision $revindex,
 					$text
 					WHERE $where $join AND rev_text_id=old_id
-					ORDER BY page_id";
+					$order $limit";
 		}
 		$result = $this->db->query( $sql, $fname );
 		$wrapper = $this->db->resultObject( $result );
@@ -215,7 +234,7 @@ class WikiExporter {
 			$this->outputStream( $wrapper );
 		}
 
-		if( $this->buffer == MW_EXPORT_STREAM ) {
+		if( $this->buffer == WikiExporter::STREAM ) {
 			$this->db->bufferResults( $prev );
 		}