http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65165
Revision: 65165
Author: mah
Date: 2010-04-17 16:49:20 +0000 (Sat, 17 Apr 2010)
Log Message:
-----------
re: r65152
* Make Job::insert() return true on success
* Change from Status object to array for API result on URL upload.
Modified Paths:
--------------
trunk/phase3/includes/JobQueue.php
trunk/phase3/includes/api/ApiUpload.php
trunk/phase3/includes/upload/UploadFromUrl.php
trunk/phase3/maintenance/tests/UploadFromUrlTest.php
Modified: trunk/phase3/includes/JobQueue.php
===================================================================
--- trunk/phase3/includes/JobQueue.php 2010-04-17 16:40:10 UTC (rev 65164)
+++ trunk/phase3/includes/JobQueue.php 2010-04-17 16:49:20 UTC (rev 65165)
@@ -76,7 +76,8 @@
$namespace = $row->job_namespace;
$dbkey = $row->job_title;
$title = Title::makeTitleSafe( $namespace, $dbkey );
- $job = Job::factory( $row->job_cmd, $title, Job::extractBlob(
$row->job_params ), $row->job_id );
+ $job = Job::factory( $row->job_cmd, $title, Job::extractBlob(
$row->job_params ),
+ $row->job_id );
$dbw->delete( 'job', $job->insertFields(), __METHOD__ );
$dbw->commit();
@@ -260,6 +261,7 @@
/**
* Insert a single job into the queue.
+ * @return bool true on success
*/
function insert() {
$fields = $this->insertFields();
@@ -272,7 +274,7 @@
return;
}
}
- $dbw->insert( 'job', $fields, __METHOD__ );
+ return $dbw->insert( 'job', $fields, __METHOD__ );
}
protected function insertFields() {
Modified: trunk/phase3/includes/api/ApiUpload.php
===================================================================
--- trunk/phase3/includes/api/ApiUpload.php 2010-04-17 16:40:10 UTC (rev
65164)
+++ trunk/phase3/includes/api/ApiUpload.php 2010-04-17 16:49:20 UTC (rev
65165)
@@ -92,10 +92,10 @@
}
$this->mUpload = new UploadFromUrl;
- $this->mUpload->initialize(
$this->mParams['filename'], $this->mParams['url'],
+ $result = $this->mUpload->initialize(
$this->mParams['filename'], $this->mParams['url'],
$this->mParams['comment'] );
- $this->getResult()->addValue( null,
$this->getModuleName(), Status::newGood() );
+ $this->getResult()->addValue( null,
$this->getModuleName(), array( 'queued' => $result ) );
return;
}
} else {
Modified: trunk/phase3/includes/upload/UploadFromUrl.php
===================================================================
--- trunk/phase3/includes/upload/UploadFromUrl.php 2010-04-17 16:40:10 UTC
(rev 65164)
+++ trunk/phase3/includes/upload/UploadFromUrl.php 2010-04-17 16:49:20 UTC
(rev 65165)
@@ -24,6 +24,7 @@
/**
* Checks if the upload from URL feature is enabled
+ * @return bool
*/
public static function isEnabled() {
global $wgAllowCopyUploads;
@@ -32,6 +33,7 @@
/**
* Entry point for API upload
+ * @return bool true on success
*/
public function initialize( $name, $url, $comment, $watchlist ) {
global $wgUser;
@@ -66,7 +68,7 @@
$job = new UploadFromUrlJob( $title, $params );
- $job->insert();
+ return $job->insert();
}
/**
Modified: trunk/phase3/maintenance/tests/UploadFromUrlTest.php
===================================================================
--- trunk/phase3/maintenance/tests/UploadFromUrlTest.php 2010-04-17
16:40:10 UTC (rev 65164)
+++ trunk/phase3/maintenance/tests/UploadFromUrlTest.php 2010-04-17
16:49:20 UTC (rev 65165)
@@ -143,9 +143,7 @@
'token' => $token,
), $data );
- $this->assertThat( $data[0]['upload'], $this->isInstanceOf(
'Status' ),
- "Got Status Object" );
- $this->assertTrue( $data[0]['upload']->isOk(), 'Job added');
+ $this->assertTrue( $data[0]['upload']['queued'], 'Job added');
$job = Job::pop();
$this->assertThat( $job, $this->isInstanceOf(
'UploadFromUrlJob' ),
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
