fix bug report merger size problem

cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java

@@ -135,7 +135,7 @@ public class BugReportBuilder implements ReportTaskBuilder {
 	private BugReport queryDailyReportsByDuration(String domain, Date start, Date end) {
 		long startTime = start.getTime();
 		long endTime = end.getTime();
-		BugReportMerger merger = new BugReportMerger(new BugReport(domain));
+		HistoryBugReportMerger merger = new HistoryBugReportMerger(new BugReport(domain));
 
 		for (; startTime < endTime; startTime += TimeUtil.ONE_DAY) {
 			try {

cat-home/src/main/java/com/dianping/cat/report/task/bug/HistoryBugReportMerger.java

+package com.dianping.cat.report.task.bug;
+
+import com.dianping.cat.home.bug.entity.BugReport;
+import com.dianping.cat.home.bug.entity.ExceptionItem;
+
+public class HistoryBugReportMerger extends BugReportMerger {
+
+	public HistoryBugReportMerger(BugReport bugReport) {
+		super(bugReport);
+	}
+
+	@Override
+	protected void mergeExceptionItem(ExceptionItem old, ExceptionItem exceptionItem) {
+		old.setCount(old.getCount() + exceptionItem.getCount());
+		old.getMessages().addAll(exceptionItem.getMessages());
+	}
+}

cat-home/src/main/webapp/WEB-INF/tags/body.tag

@@ -21,7 +21,7 @@
 	<div class="navbar navbar-inverse">
       <div class="navbar-inner">
         <div class="container-fluid">
-       	  <a class="brand" href="#">CAT</a>
+       	  <a class="brand" href="/cat/r/home?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&reportType=${payload.reportType}&op=${payload.action.name}">CAT</a>
           <div class="nav-collapse collapse">
           	<div class="nav  pull-right">
           		<c:forEach var="page" items="${navBar.systemPages}">

cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag

@@ -37,7 +37,7 @@
 			</td> 
 			<td class="title"><span class="text-success"><span class="text-error">【报表时间】</span><jsp:invoke fragment="subtitle"/></span></td>
 			<td class="nav">
-				<span class="text-error">【<a class="switch" href="${model.baseUri}?op=history&domain=${model.domain}&ip=${model.ipAddress}"><span class="text-error">切到历史模式</span></a>】</span>
+				<span class="text-error switch">【<a class="switch" href="${model.baseUri}?op=history&domain=${model.domain}&ip=${model.ipAddress}"><span class="text-error">切到历史模式</span></a>】</span>
 				<c:forEach var="nav" items="${model.navs}">
 					&nbsp;[ <a href="${model.baseUri}?date=${model.date}&ip=${model.ipAddress}&step=${nav.hours}&${navUrlPrefix}">${nav.title}</a> ]
 				</c:forEach>