modify the app default value

cat-core/src/main/java/com/dianping/cat/config/app/QueryEntity.java

@@ -3,6 +3,8 @@ package com.dianping.cat.config.app;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import org.jboss.netty.util.internal.StringUtil;
+import org.unidal.lookup.util.StringUtils;
 
 import com.dianping.cat.Cat;
 
@@ -32,19 +34,32 @@ public class QueryEntity {
 
 		try {
 			m_date = sdf.parse(strs[0]);
-			m_command = Integer.parseInt(strs[1]);
-			m_code = Integer.parseInt(strs[2]);
-			m_network = Integer.parseInt(strs[3]);
-			m_version = Integer.parseInt(strs[4]);
-			m_channel = Integer.parseInt(strs[5]);
-			m_platfrom = Integer.parseInt(strs[6]);
-			m_city = Integer.parseInt(strs[7]);
-			m_operator = Integer.parseInt(strs[8]);
+			m_command = parseValue(strs[1]);
+			m_code = parseValue(strs[2]);
+			m_network = parseValue(strs[3]);
+			m_version = parseValue(strs[4]);
+			m_channel = parseValue(strs[5]);
+			m_platfrom = parseValue(strs[6]);
+			m_city = parseValue(strs[7]);
+			m_operator = parseValue(strs[8]);
 		} catch (ParseException e) {
 			Cat.logError(e);
 		}
 	}
 
+	private int parseValue(String str) {
+		if (StringUtils.isEmpty(str)) {
+			return -1;
+		} else {
+			try {
+				return Integer.parseInt(str);
+			} catch (NumberFormatException e) {
+				Cat.logError(e);
+			}
+		}
+		return -1;
+	}
+
 	public Date getDate() {
 		return m_date;
 	}
@@ -118,10 +133,10 @@ public class QueryEntity {
 	}
 
 	@Override
-   public String toString() {
-	   return "QueryEntity [m_date=" + m_date + ", m_command=" + m_command + ", m_code=" + m_code + ", m_network="
-	         + m_network + ", m_version=" + m_version + ", m_channel=" + m_channel + ", m_platfrom=" + m_platfrom
-	         + ", m_city=" + m_city + ", m_operator=" + m_operator + "]";
-   }
-	
+	public String toString() {
+		return "QueryEntity [m_date=" + m_date + ", m_command=" + m_command + ", m_code=" + m_code + ", m_network="
+		      + m_network + ", m_version=" + m_version + ", m_channel=" + m_channel + ", m_platfrom=" + m_platfrom
+		      + ", m_city=" + m_city + ", m_operator=" + m_operator + "]";
+	}
+
 }

cat-home/src/main/webapp/jsp/report/app.jsp

@@ -194,10 +194,9 @@
 						<c:forEach var="item" items="${model.commands}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
-				</select> 返回码 <select id="code" style="width: 120px;"><option
-							value='-1'>All</option>
+				</select> 返回码 <select id="code" style="width: 120px;"><option value=''>All</option>
 				</select> 网络类型 <select id="network" style="width: 80px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.networks}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
@@ -206,29 +205,29 @@
 			</tr>
 			<tr>
 				<th align=left>版本 <select id="version" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.versions}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 连接类型 <select id="connectionType" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.connectionTypes}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 平台 <select id="platform" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.platforms}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 地区 <select id="city" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.cities}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 运营商 <select id="operator" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.operators}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
@@ -256,9 +255,9 @@
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 返回码 <select id="code2" style="width: 120px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 				</select> 网络类型 <select id="network2" style="width: 80px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.networks}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
@@ -267,29 +266,29 @@
 			</tr>
 			<tr>
 				<th align=left>版本 <select id="version2" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.versions}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 连接类型 <select id="connectionType2" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.connectionTypes}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 平台 <select id="platform2" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.platforms}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 地区 <select id="city2" style="width: 100px;">
-						<option value='-1'>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.cities}" varStatus="status">
 							<option value='${item.id}'>${item.name}</option>
 						</c:forEach>
 				</select> 运营商 <select id="operator2" style="width: 100px;">
-						<option>All</option>
+						<option value=''>All</option>
 						<c:forEach var="item" items="${model.operators}"
 							varStatus="status">
 							<option value='${item.id}'>${item.name}</option>