Skip to content

Commit

Permalink
pkp/pkp-lib#2295 upgrade of old statistics to 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@bozana
bozana committed Feb 17, 2017
1 parent 448a170 commit fc73c76
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions classes/install/Upgrade.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,8 @@ function migrateTimedViewsUsageStatistics() {
// Articles.
$params = array('ojs::timedViews', $loadId, ASSOC_TYPE_SUBMISSION);
$tempStatsDao->update(
'INSERT INTO metrics (load_id, metric_type, assoc_type, assoc_id, day, country_id, region, city, submission_id, metric, context_id, issue_id)
SELECT tr.load_id, ?, tr.assoc_type, tr.assoc_id, tr.day, tr.country_id, tr.region, tr.city, tr.assoc_id, count(tr.metric), a.context_id, pa.issue_id
'INSERT INTO metrics (load_id, metric_type, assoc_type, assoc_id, day, country_id, region, city, submission_id, metric, context_id, assoc_object_type, assoc_object_id)
SELECT tr.load_id, ?, tr.assoc_type, tr.assoc_id, tr.day, tr.country_id, tr.region, tr.city, tr.assoc_id, count(tr.metric), a.context_id, ' . ASSOC_TYPE_ISSUE . ', pa.issue_id
FROM usage_stats_temporary_records AS tr
LEFT JOIN submissions AS a ON a.submission_id = tr.assoc_id
LEFT JOIN published_submissions AS pa ON pa.submission_id = tr.assoc_id
Expand All @@ -557,8 +557,8 @@ function migrateTimedViewsUsageStatistics() {
// Galleys.
$params = array('ojs::timedViews', $loadId, ASSOC_TYPE_GALLEY);
$tempStatsDao->update(
'INSERT INTO metrics (load_id, metric_type, assoc_type, assoc_id, day, country_id, region, city, submission_id, metric, context_id, issue_id)
SELECT tr.load_id, ?, tr.assoc_type, tr.assoc_id, tr.day, tr.country_id, tr.region, tr.city, ag.submission_id, count(tr.metric), a.context_id, pa.issue_id
'INSERT INTO metrics (load_id, metric_type, assoc_type, assoc_id, day, country_id, region, city, submission_id, metric, context_id, assoc_object_type, assoc_object_id)
SELECT tr.load_id, ?, tr.assoc_type, tr.assoc_id, tr.day, tr.country_id, tr.region, tr.city, ag.submission_id, count(tr.metric), a.context_id, ' . ASSOC_TYPE_ISSUE . ', pa.issue_id
FROM usage_stats_temporary_records AS tr
LEFT JOIN submission_galleys AS ag ON ag.galley_id = tr.assoc_id
LEFT JOIN submissions AS a ON a.submission_id = ag.submission_id
Expand All @@ -581,7 +581,7 @@ function migrateTimedViewsUsageStatistics() {
function migrateDefaultUsageStatistics() {
$loadId = '3.0.0-upgrade-ojsViews';
$metricsDao = DAORegistry::getDAO('MetricsDAO');
$insertIntoClause = 'INSERT INTO metrics (file_type, load_id, metric_type, assoc_type, assoc_id, submission_id, metric, context_id, issue_id)';
$insertIntoClause = 'INSERT INTO metrics (file_type, load_id, metric_type, assoc_type, assoc_id, submission_id, metric, context_id, assoc_object_type, assoc_object_id)';
$selectClause = null; // Conditionally set later

// Galleys.
Expand All @@ -605,7 +605,7 @@ function migrateDefaultUsageStatistics() {

if ($case['assocType'] == ASSOC_TYPE_GALLEY) {
array_push($params, (int) $case['isHtml']);
$selectClause = ' SELECT ?, ?, ?, ?, ag.galley_id, ag.article_id, ag.views, a.context_id, pa.issue_id
$selectClause = ' SELECT ?, ?, ?, ?, ag.galley_id, ag.article_id, ag.views, a.context_id, ' . ASSOC_TYPE_ISSUE . ', pa.issue_id
FROM article_galleys_stats_migration as ag
LEFT JOIN submissions AS a ON ag.article_id = a.submission_id
LEFT JOIN published_submissions as pa on ag.article_id = pa.submission_id
Expand All @@ -614,7 +614,7 @@ function migrateDefaultUsageStatistics() {
AND af.file_type ';
} else {
if ($this->tableExists('issue_galleys_stats_migration')) {
$selectClause = 'SELECT ?, ?, ?, ?, ig.galley_id, 0, ig.views, i.journal_id, ig.issue_id
$selectClause = 'SELECT ?, ?, ?, ?, ig.galley_id, 0, ig.views, i.journal_id, ' . ASSOC_TYPE_ISSUE . ', ig.issue_id
FROM issue_galleys_stats_migration AS ig
LEFT JOIN issues AS i ON ig.issue_id = i.issue_id
LEFT JOIN issue_files AS ifi ON ig.file_id = ifi.file_id
Expand All @@ -636,7 +636,7 @@ function migrateDefaultUsageStatistics() {
// Published articles.
$params = array(null, $loadId, 'ojs::legacyDefault', ASSOC_TYPE_SUBMISSION);
$metricsDao->update($insertIntoClause .
' SELECT ?, ?, ?, ?, pa.article_id, pa.article_id, pa.views, i.journal_id, pa.issue_id
' SELECT ?, ?, ?, ?, pa.article_id, pa.article_id, pa.views, i.journal_id, ' . ASSOC_TYPE_ISSUE . ', pa.issue_id
FROM published_articles_stats_migration as pa
LEFT JOIN issues AS i ON pa.issue_id = i.issue_id
WHERE pa.views > 0 AND i.issue_id is not null;', $params, false);
Expand Down
14 changes: 7 additions & 7 deletions dbscripts/xml/upgrade.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@
<data file="dbscripts/xml/upgrade/3.0.0_adaptReferrals.xml" condition="return $installer->tableExists('referrals');" />
<data file="dbscripts/xml/upgrade/3.0.0_adaptBooksForReview.xml" condition="return $installer->tableExists('books_for_review');" />
<data file="dbscripts/xml/upgrade/remove_timed_views_bots.xml" condition="return $installer->tableExists('timed_views_log');" />
<code function="migrateCounterPluginUsageStatistics" condition="return $installer->tableExists('counter_monthly_log');" />
<code function="migrateTimedViewsUsageStatistics" condition="return $installer->tableExists('timed_views_log');" />
<code function="migrateDefaultUsageStatistics" condition="return $installer->tableExists('article_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postUsageStatsMigration.xml" condition="return $installer->tableExists('article_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postUsageStatsMigration2.xml" condition="return $installer->tableExists('issue_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postCounterMigration.xml" condition="return $installer->tableExists('counter_monthly_log');" />
<data file="dbscripts/xml/upgrade/2.4.0_postTimedViewsMigration.xml" condition="return $installer->tableExists('timed_views_log');" />
<data file="dbscripts/xml/upgrade/3.0.0_preupdate_commentsToEditor.xml" condition="return $installer->columnExists('submissions', 'comments_to_ed');" />
</upgrade>

Expand Down Expand Up @@ -75,6 +68,13 @@
<data file="dbscripts/xml/indexes.xml" />

<upgrade minversion="2.4.0.0" maxversion="2.4.9.9">
<code function="migrateCounterPluginUsageStatistics" condition="return $installer->tableExists('counter_monthly_log');" />
<code function="migrateTimedViewsUsageStatistics" condition="return $installer->tableExists('timed_views_log');" />
<code function="migrateDefaultUsageStatistics" condition="return $installer->tableExists('article_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postUsageStatsMigration.xml" condition="return $installer->tableExists('article_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postUsageStatsMigration2.xml" condition="return $installer->tableExists('issue_galleys_stats_migration');" />
<data file="dbscripts/xml/upgrade/2.4.0_postCounterMigration.xml" condition="return $installer->tableExists('counter_monthly_log');" />
<data file="dbscripts/xml/upgrade/2.4.0_postTimedViewsMigration.xml" condition="return $installer->tableExists('timed_views_log');" />
<data file="dbscripts/xml/upgrade/3.0.0_change_assoc_type.xml" />
<data file="dbscripts/xml/upgrade/3.0.0_change_assoc_type_metrics.xml" condition="return $installer->tableExists('metrics');" />
<data file="dbscripts/xml/upgrade/3.0.0_settings.xml" />
Expand Down

0 comments on commit fc73c76

Please sign in to comment.