From 2c62751d1b742d072f7418c00eda835ff2ffc7be Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 15 Nov 2006 09:52:49 +0000
Subject: [PATCH] Added --shared-desc and --no-shared-desc options, for strict
 job ordering when slicing.

---
 maintenance/dumpHTML.inc | 12 ++++++++++--
 maintenance/dumpHTML.php |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index 8213fa9b5a..52c8bcbfc9 100644
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -38,6 +38,9 @@ class DumpHTML {
 	# Make a copy of all images encountered
 	var $makeSnapshot = false;
 
+	# Don't image description pages in doEverything()
+	var $noSharedDesc = false;
+
 	# Make links assuming the script path is in the same directory as
 	# the destination
 	var $alternateScriptPath = false;
@@ -130,7 +133,10 @@ class DumpHTML {
 			$this->doSpecials();
 		}
 		$this->doLocalImageDescriptions();
-		$this->doSharedImageDescriptions();
+
+		if ( !$this->noSharedDesc ) {
+			$this->doSharedImageDescriptions();
+		}
 
 		$this->setCheckpoint( 'everything', 'done' );
 	}
@@ -224,7 +230,9 @@ class DumpHTML {
 
 	function doImageDescriptions() {
 		$this->doLocalImageDescriptions();
-		$this->doSharedImageDescriptions();
+		if ( !$this->noSharedDesc ) {
+			$this->doSharedImageDescriptions();
+		}
 	}
 
 	/**
diff --git a/maintenance/dumpHTML.php b/maintenance/dumpHTML.php
index 5e347e4b5e..12b6fc263e 100644
--- a/maintenance/dumpHTML.php
+++ b/maintenance/dumpHTML.php
@@ -17,6 +17,8 @@
  * --checkpoint <file>  use a checkpoint file to allow restarting of interrupted dumps
  * --slice <n/m>        split the job into m segments and do the n'th one
  * --images             only do image description pages
+ * --shared-desc        only do shared (commons) image description pages
+ * --no-shared-desc     don't do shared image description pages
  * --categories         only do category pages
  * --redirects          only do redirects
  * --special            only do miscellaneous stuff
@@ -93,6 +95,7 @@ $wgHTMLDump = new DumpHTML( array(
 	'sliceDenominator' => $sliceDenominator,
 	'noOverwrite' => $options['no-overwrite'],
 	'compress' => $options['compress'],
+	'noSharedDesc' => $options['no-shared-desc'],
 ));
 
 
@@ -104,6 +107,8 @@ if ( $options['special'] ) {
 	$wgHTMLDump->doCategories();
 } elseif ( $options['redirects'] ) {
 	$wgHTMLDump->doRedirects();
+} elseif ( $options['shared-desc'] ) {
+	$wgHTMLDump->doSharedImageDescriptions();
 } else {
 	print "Creating static HTML dump in directory $dest. \n";
 	$dbr =& wfGetDB( DB_SLAVE );
-- 
2.20.1