OSDN Git Service

ログが存在しないときにブラウザでJavaScriptのAlertが出るのを直す
authorKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Sun, 28 Dec 2014 12:01:24 +0000 (21:01 +0900)
committerKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Mon, 29 Dec 2014 13:12:32 +0000 (22:12 +0900)
KancolleSniffer/LogServer.cs
LogViewer/index.html

index 09eaa14..007ed15 100644 (file)
@@ -83,8 +83,7 @@ namespace KancolleSniffer
                             SendFile(client, csv, "text/csv; charset=Shift_JIS");\r
                             continue;\r
                         }\r
-                        if (path.EndsWith(".json", StringComparison.OrdinalIgnoreCase) &&\r
-                            File.Exists(csv.Replace(".json", ".csv")))\r
+                        if (path.EndsWith(".json", StringComparison.OrdinalIgnoreCase))\r
                         {\r
                             SendJsonData(client, csv);\r
                             continue;\r
@@ -143,13 +142,17 @@ namespace KancolleSniffer
             header.Flush();\r
             client.Send(((MemoryStream)header.BaseStream).ToArray());\r
 \r
+            var csv = path.Replace(".json", ".csv");\r
             var encoding = Encoding.GetEncoding("Shift_JIS");\r
             client.Send(encoding.GetBytes("{ \"data\": [\n"));\r
-            var delimiter = "";\r
-            foreach (var line in File.ReadLines(path.Replace(".json", ".csv"), encoding).Skip(1))\r
+            if (File.Exists(csv))\r
             {\r
-                client.Send(encoding.GetBytes(delimiter + "[\"" + string.Join("\",\"", line.Split(',')) + "\"]"));\r
-                delimiter = ",\n";\r
+                var delimiter = "";\r
+                foreach (var line in File.ReadLines(csv, encoding).Skip(1))\r
+                {\r
+                    client.Send(encoding.GetBytes(delimiter + "[\"" + string.Join("\",\"", line.Split(',')) + "\"]"));\r
+                    delimiter = ",\n";\r
+                }\r
             }\r
             client.Send(encoding.GetBytes("]}\n"));\r
         }\r
index ef5cfd2..171ea07 100644 (file)
@@ -25,6 +25,7 @@ body {
 <body>
 <script>
 $(function() {
+    $.fn.dataTable.ext.errMode = 'throw';
     $.extend($.fn.dataTable.defaults, {
         stateSave: true,
         order: [[0, "desc"]],