Skip to content

Commit

Permalink
Bugfix metrics load & metrics no-guestbook. Wire in metrics #5445 #5447
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthew-a-dunlap
matthew-a-dunlap committed Jan 15, 2019
1 parent 59e7ca5 commit e008600
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 36 deletions.
50 changes: 31 additions & 19 deletions ...source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,18 @@
</div>
<div class="col-xs-12 row">
<div class="col-xs-4"><div style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">All</div></div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeDatasetsValue">5,640,188</div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysDatasetsValue">66,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeAllDatasetsValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysAllDatasetsValue"></div>
</div>
<div class="col-xs-12 row">
<div class="col-xs-4" style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">Deposited</div>
<div class="col-xs-4 h4 lite-header">5,000,000</div>
<div class="col-xs-4 h4 lite-header">60,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeDepositedDatasetsValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysDepositedDatasetsValue"></div>
</div>
<div class="col-xs-12 row">
<div class="col-xs-4" style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">Harvested</div>
<div class="col-xs-4 h4 lite-header">640,188</div>
<div class="col-xs-4 h4 lite-header">6,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeHarvestedDatasetsValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysHarvestedDatasetsValue"></div>
</div>

</div>
Expand All @@ -188,18 +188,18 @@
</div>
<div class="col-xs-12 row">
<div class="col-xs-4" style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">All</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeFilesValue">5,640,188</div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysFilesValue">66,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeAllFilesValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysAllFilesValue"></div>
</div>
<div class="col-xs-12 row">
<div class="col-xs-4" style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">Deposited</div>
<div class="col-xs-4 h4 lite-header">5,000,000</div>
<div class="col-xs-4 h4 lite-header">60,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeDepositedFilesValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysDepositedFilesValue"></div>
</div>
<div class="col-xs-12 row">
<div class="col-xs-4" style="line-height: 19px;margin-top: 10px;margin-bottom: 10px;">Harvested</div>
<div class="col-xs-4 h4 lite-header">640,188</div>
<div class="col-xs-4 h4 lite-header">6,177</div>
<div class="col-xs-4 h4 lite-header" id="activityAllTimeHarvestedFilesValue"></div>
<div class="col-xs-4 h4 lite-header" id="activity30DaysHarvestedFilesValue"></div>
</div>

</div>
Expand Down Expand Up @@ -300,8 +300,7 @@
dvArray.push([item.subject, item.count/*.toLocaleString('en')*/]);
}
});
});
$.get(metricBaseUrl + "datasets/bySubject?dataLocation=all", function(jData) {
$.get(metricBaseUrl + "datasets/bySubject?dataLocation=all", function(jData) {
//var subArray = [];
var resultHtml = "";
jData.data.forEach(function(item) {
Expand All @@ -322,16 +321,29 @@
});
document.getElementById(elm).innerHTML = resultHtml;
});
});

}

writeRecentDatasetsInDataverses("(Journal)" , 3, "journals");
writeRecentDatasetsInDataverses("(\"Research+Project\"%20OR%20Researcher%20OR%20\"Research+Group\")" , 6, "researchers");

queryMetricSimple("datasets", "", "activityAllTimeDatasetsValue");
queryMetricSimple("downloads", "", "activityAllTimeFilesValue");

queryMetricSimple("datasets/pastDays", "/30", "activity30DaysDatasetsValue");
queryMetricSimple("downloads/pastDays", "/30", "activity30DaysFilesValue");
queryMetricSimple("datasets", "", "activityAllTimeAllDatasetsValue");
queryMetricSimple("datasets/pastDays", "/30", "activity30DaysAllDatasetsValue");
queryMetricSimple("datasets", "?dataLocation=local", "activityAllTimeDepositedDatasetsValue");
queryMetricSimple("datasets/pastDays", "/30?dataLocation=local", "activity30DaysDepositedDatasetsValue");
queryMetricSimple("datasets", "?dataLocation=remote", "activityAllTimeHarvestedDatasetsValue");
queryMetricSimple("datasets/pastDays", "/30?dataLocation=remote", "activity30DaysHarvestedDatasetsValue");

queryMetricSimple("downloads", "", "activityAllTimeAllFilesValue");
queryMetricSimple("downloads/pastDays", "/30", "activity30DaysAllFilesValue");
queryMetricSimple("downloads", "?dataLocation=local", "activityAllTimeDepositedFilesValue");
queryMetricSimple("downloads/pastDays", "/30?dataLocation=local", "activity30DaysDepositedFilesValue");
queryMetricSimple("downloads", "?dataLocation=remote", "activityAllTimeHarvestedFilesValue");
queryMetricSimple("downloads/pastDays", "/30?dataLocation=remote", "activity30DaysHarvestedFilesValue");

// queryMetricSimple("downloads/pastDays", "/30", "activity30DaysFilesValue");
// queryMetricSimple("downloads", "", "activityAllTimeFilesValue");

//querySubject("dataversesBySubject");
querySubjectDataverseDataset("dataversesBySubject")
Expand Down
41 changes: 24 additions & 17 deletions src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
Expand Down Expand Up @@ -260,25 +261,31 @@ public long downloadsToMonth(String yyyymm) throws Exception {
+ "ORDER BY responsetime LIMIT 1;"
);

Timestamp earlyDateTimestamp = (Timestamp) earlyDateQuery.getSingleResult();
Date earliestDate = new Date(earlyDateTimestamp.getTime());
SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM");
Date dateQueried = formatter2.parse(yyyymm);

if(!dateQueried.before(earliestDate)) {
Query query = em.createNativeQuery(""
+ "select count(id)\n"
+ "from guestbookresponse\n"
+ "where date_trunc('month', responsetime) <= to_date('" + yyyymm + "','YYYY-MM')"
+ "or responsetime is NULL;" //includes historic guestbook records without date
);
logger.fine("query: " + query);
return (long) query.getSingleResult();
}
else {
//When we query before the earliest dated record, return 0;
try {
Timestamp earlyDateTimestamp = (Timestamp) earlyDateQuery.getSingleResult();
Date earliestDate = new Date(earlyDateTimestamp.getTime());
SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM");
Date dateQueried = formatter2.parse(yyyymm);

if(!dateQueried.before(earliestDate)) {
Query query = em.createNativeQuery(""
+ "select count(id)\n"
+ "from guestbookresponse\n"
+ "where date_trunc('month', responsetime) <= to_date('" + yyyymm + "','YYYY-MM')"
+ "or responsetime is NULL;" //includes historic guestbook records without date
);
logger.fine("query: " + query);
return (long) query.getSingleResult();
}
else {
//When we query before the earliest dated record, return 0;
return 0L;
}
} catch(NoResultException e) {
//If earlyDateQuery.getSingleResult is null, then there are no guestbooks and we can return 0
return 0L;
}



}
Expand Down

0 comments on commit e008600

Please sign in to comment.