https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114884
Revision: 114884
Author: kaldari
Date: 2012-04-13 17:38:48 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
splitting single timestamp into creation date and tag update date
Modified Paths:
--------------
trunk/extensions/PageTriage/PageTriage.php
trunk/extensions/PageTriage/api/ApiPageTriageList.php
trunk/extensions/PageTriage/includes/ArticleMetadata.php
trunk/extensions/PageTriage/includes/PageTriage.php
trunk/extensions/PageTriage/includes/PageTriageUtil.php
trunk/extensions/PageTriage/sql/PageTriagePage.sql
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-13 11:16:01 UTC (rev
114883)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-13 17:38:48 UTC (rev
114884)
@@ -115,7 +115,8 @@
$updater->addExtensionTable( 'pagetriage_page_tags', $base .
'/PageTriagePageTags.sql' );
$updater->addExtensionTable( 'pagetriage_page', $base .
'/PageTriagePage.sql' );
$updater->addExtensionTable( 'pagetriage_log', $base .
'/PageTriageLog.sql' );
-
+ $updater->addExtensionUpdate( array( 'addField', 'pagetriage_page',
'ptrp_tags_updated',
+ $base . '/PageTriageTimestamps.patch.sql', true ) );
return true;
}
Modified: trunk/extensions/PageTriage/api/ApiPageTriageList.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-13
11:16:01 UTC (rev 114883)
+++ trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-13
17:38:48 UTC (rev 114884)
@@ -47,10 +47,10 @@
$options['LIMIT'] = $opts['limit'] + 1;
if ( strtolower( $opts['dir'] ) === 'oldestfirst' ) {
- $options['ORDER BY'] = 'ptrp_timestamp ASC,
ptrp_page_id ASC';
+ $options['ORDER BY'] = 'ptrp_created ASC, ptrp_page_id
ASC';
$offsetOperator = ' > ';
} else {
- $options['ORDER BY'] = 'ptrp_timestamp DESC,
ptrp_page_id DESC';
+ $options['ORDER BY'] = 'ptrp_created DESC, ptrp_page_id
DESC';
$offsetOperator = ' < ';
}
@@ -78,11 +78,11 @@
if ( array_key_exists( 'offset', $opts ) && is_numeric(
$opts['offset'] ) && $opts['offset'] > 0 ) {
// Offset the list by page ID as well (in case multiple
pages have the same timestamp)
if ( array_key_exists( 'pageoffset', $opts ) &&
is_numeric( $opts['pageoffset'] ) && $opts['pageoffset'] > 0 ) {
- $conds[] = '( ptrp_timestamp' . $offsetOperator
. $opts['offset'] . ') OR ' .
- '( ptrp_timestamp = ' . $opts['offset']
.' AND ' .
+ $conds[] = '( ptrp_created' . $offsetOperator .
$opts['offset'] . ') OR ' .
+ '( ptrp_created = ' . $opts['offset']
.' AND ' .
'ptrp_page_id ' . $offsetOperator .
$opts['pageoffset'] . ')';
} else {
- $conds[] = 'ptrp_timestamp' . $offsetOperator .
$opts['offset'];
+ $conds[] = 'ptrp_created' . $offsetOperator .
$opts['offset'];
}
}
Modified: trunk/extensions/PageTriage/includes/ArticleMetadata.php
===================================================================
--- trunk/extensions/PageTriage/includes/ArticleMetadata.php 2012-04-13
11:16:01 UTC (rev 114883)
+++ trunk/extensions/PageTriage/includes/ArticleMetadata.php 2012-04-13
17:38:48 UTC (rev 114884)
@@ -142,7 +142,7 @@
$res = $dbr->select(
array( 'pagetriage_page_tags',
'pagetriage_tags', 'pagetriage_page' ),
- array( 'ptrpt_page_id',
'ptrt_tag_name', 'ptrpt_value', 'ptrp_reviewed', 'ptrp_timestamp' ),
+ array( 'ptrpt_page_id',
'ptrt_tag_name', 'ptrpt_value', 'ptrp_reviewed', 'ptrp_created' ),
array( 'ptrpt_page_id' => $articles,
'ptrpt_tag_id = ptrt_tag_id', 'ptrpt_page_id = ptrp_page_id' ),
__METHOD__
);
@@ -151,7 +151,7 @@
foreach ( $res as $row ) {
$pageData[$row->ptrpt_page_id][$row->ptrt_tag_name] = $row->ptrpt_value;
if ( !isset(
$pageData[$row->ptrpt_page_id]['creation_date'] ) ) {
-
$pageData[$row->ptrpt_page_id]['creation_date'] = $row->ptrp_timestamp;
+
$pageData[$row->ptrpt_page_id]['creation_date'] = $row->ptrp_created;
$pageData[$row->ptrpt_page_id]['patrol_status'] = $row->ptrp_reviewed;
}
}
Modified: trunk/extensions/PageTriage/includes/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-13 11:16:01 UTC
(rev 114883)
+++ trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-13 17:38:48 UTC
(rev 114884)
@@ -53,7 +53,7 @@
$row = array(
'ptrp_page_id' => $this->mPageId,
'ptrp_reviewed' => $reviewed,
- 'ptrp_timestamp' => $res->creation_date
+ 'ptrp_created' => $res->creation_date
);
$dbw->insert( 'pagetriage_page', $row, __METHOD__, array(
'IGNORE' ) );
@@ -141,7 +141,7 @@
$res = $dbr->selectRow(
array( 'pagetriage_page' ),
- array( 'ptrp_reviewed', 'ptrp_timestamp',
'ptrp_deleted' ),
+ array( 'ptrp_reviewed', 'ptrp_created', 'ptrp_deleted'
),
array( 'ptrp_page_id' => $this->mPageId ),
__METHOD__
);
@@ -151,7 +151,7 @@
}
$this->mReviewed = $res->ptrp_reviewed;
- $this->mTimestamp = $res->ptrp_timestamp;
+ $this->mTimestamp = $res->ptrp_created;
$this->mDeleted = $res->ptrp_deleted;
$this->mLoaded = true;
return true;
Modified: trunk/extensions/PageTriage/includes/PageTriageUtil.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriageUtil.php 2012-04-13
11:16:01 UTC (rev 114883)
+++ trunk/extensions/PageTriage/includes/PageTriageUtil.php 2012-04-13
17:38:48 UTC (rev 114884)
@@ -151,7 +151,7 @@
$res = $dbr->selectRow(
array( 'pagetriage_page' ),
array( 'COUNT(ptrp_page_id) AS num' ),
- array( 'ptrp_reviewed = 1', 'ptrp_timestamp > ' .
$dbr->addQuotes( $dbr->timestamp( wfTimestamp( TS_UNIX ) - 7 * 24 * 60 * 60 ) )
),
+ array( 'ptrp_reviewed = 1', 'ptrp_created > ' .
$dbr->addQuotes( $dbr->timestamp( wfTimestamp( TS_UNIX ) - 7 * 24 * 60 * 60 ) )
),
__METHOD__
);
@@ -200,14 +200,14 @@
$res = $dbr->selectRow(
array( 'pagetriage_page' ),
- array( 'ptrp_timestamp' ),
+ array( 'ptrp_created' ),
array( 'ptrp_reviewed' => 0 ),
__METHOD__,
- array( 'ORDER BY' => "ptrp_timestamp $order", 'LIMIT'
=> '1', 'OFFSET' => $start )
+ array( 'ORDER BY' => "ptrp_created $order", 'LIMIT' =>
'1', 'OFFSET' => $start )
);
if ( $res ) {
- return $res->ptrp_timestamp;
+ return $res->ptrp_created;
} else {
return false;
}
Modified: trunk/extensions/PageTriage/sql/PageTriagePage.sql
===================================================================
--- trunk/extensions/PageTriage/sql/PageTriagePage.sql 2012-04-13 11:16:01 UTC
(rev 114883)
+++ trunk/extensions/PageTriage/sql/PageTriagePage.sql 2012-04-13 17:38:48 UTC
(rev 114884)
@@ -1,9 +1,9 @@
-- Store the list of articles to be reviewed or being reviewed already
CREATE TABLE /*_*/pagetriage_page (
ptrp_page_id int unsigned NOT NULL PRIMARY KEY,
- ptrp_reviewed tinyint unsigned not null default 0,
- ptrp_deleted tinyint unsigned not null default 0,
- ptrp_timestamp varbinary(14) NOT NULL COMMENT 'when the page was
created'
+ ptrp_reviewed tinyint unsigned NOT NULL DEFAULT 0,
+ ptrp_deleted tinyint unsigned NOT NULL DEFAULT 0,
+ ptrp_timestamp varbinary(14) NOT NULL
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/ptrp_reviewed_timestamp_page_id ON /*_*/pagetriage_page
(ptrp_reviewed, ptrp_timestamp, ptrp_page_id, ptrp_deleted);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
