http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72921
Revision: 72921
Author: daniel
Date: 2010-09-13 18:45:43 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
improved error resilliance
Modified Paths:
--------------
trunk/extensions/DataTransclusion/ImportMAB2.php
Modified: trunk/extensions/DataTransclusion/ImportMAB2.php
===================================================================
--- trunk/extensions/DataTransclusion/ImportMAB2.php 2010-09-13 18:13:57 UTC
(rev 72920)
+++ trunk/extensions/DataTransclusion/ImportMAB2.php 2010-09-13 18:45:43 UTC
(rev 72921)
@@ -113,6 +113,11 @@
$this->output( "scanning directory $dir\n" );
$d = opendir( $dir );
+ if ( !$d ) {
+ $this->error( "unable to open directory $dir!\n" );
+ return false;
+ }
+
while( ( $file = readdir( $d ) ) ) {
if ( $file == "." or $file == ".." ) {
continue;
@@ -187,7 +192,7 @@
if ( $this->noblob ) {
$id = 0;
} else {
- $db->insert( $this->blob_table, $insert );
+ $db->insert( $this->blob_table, $insert, __METHOD__ );
$id = $db->insertId();
}
@@ -201,7 +206,7 @@
}
}
- $db->insert( $this->index_table, $insert );
+ $db->insert( $this->index_table, $insert, __METHOD__, array(
'IGNORE' ) );
}
public function readMabFile( $file ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
