http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73199
Revision: 73199
Author: daniel
Date: 2010-09-17 08:46:17 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
improved console output
Modified Paths:
--------------
trunk/extensions/DataTransclusion/ImportMAB2.php
Modified: trunk/extensions/DataTransclusion/ImportMAB2.php
===================================================================
--- trunk/extensions/DataTransclusion/ImportMAB2.php 2010-09-17 08:10:38 UTC
(rev 73198)
+++ trunk/extensions/DataTransclusion/ImportMAB2.php 2010-09-17 08:46:17 UTC
(rev 73199)
@@ -90,19 +90,22 @@
$src = $this->mArgs[0];
$dir = $this->mArgs[1];
- $this->blob_table = $this->mArgs[2];
- $this->index_table = $this->mArgs[3];
if ( !isset( $wgDataTransclusionSources[ $src ] ) ) {
throw new MWException( "unknown transclusion data
source '$src', not found in \$wgDataTransclusionSources" );
}
+ $this->output( "using settings for data transclusion source
\"$src\".\n" );
+
$this->source = DataTransclusionHandler::getDataSource( $src );
if ( !( $this->source instanceof DBDataTransclusionSource ) ) {
throw new MWException( "bad data source '$src': not
compatible with DBDataTransclusionSource" );
}
+ $this->blob_table = $this->mArgs[2];
+ $this->index_table = $this->mArgs[3];
+
if ( $this->hasOption( 'prefix' ) ) {
$prefix = $this->getOption( "prefix" );
$this->blob_table = $prefix . $this->blob_table;
@@ -113,10 +116,16 @@
$this->index_table = $db->tableName( $this->index_table
);
}
- if ( $this->hasOption('create') && !$this->debug ) {
- $this->createTables( $this->blob_table,
$this->index_table );
- } else if ( $this->hasOption('truncate') && !$this->debug ) {
- $this->truncateTables( $this->blob_table,
$this->index_table );
+ if ( !$this->debug ) {
+ $this->output( "using tables {$this->blob_table} and
{$this->index_table}.\n" );
+
+ if ( $this->hasOption('create') ) {
+ $this->output( "creating tables if
neccessary.\n" );
+ $this->createTables( $this->blob_table,
$this->index_table );
+ } else if ( $this->hasOption('truncate') ) {
+ $this->output( "truncating tables.\n" );
+ $this->truncateTables( $this->blob_table,
$this->index_table );
+ }
}
$this->id_map = array();
@@ -354,7 +363,7 @@
}
if ( !$found ) {
- $this->output( "ignoring record #$id
from file $file\n" );
+ $this->output( "ignoring record #$id\n"
);
continue;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
