Changeset 7481

Timestamp:

Apr 26, 2018, 8:58:47 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2115: Problems with formatting in the "Test with file"

Fixed mainly by applying some CSS rules. Also fixed so that no more than 99 columns are outputted, but the real number is displayed in the "Columns" column. Skipped rows are no longer displayed as "errors" but in a more neutral color.

File:

• branches/3.12-stable/www/common/plugin/parse_file.jsp (modified) (10 diffs)

branches/3.12-stable/www/common/plugin/parse_file.jsp

@@ -24 +24 @@
   @version 2.0
 --%>
-<%@page import="org.json.simple.JSONObject"%>
 <%@ page pageEncoding="UTF-8" session="false"
   contentType="text/html; charset=UTF-8"  
@@ -49 +48 @@
   import="java.io.InputStream"
   import="org.json.simple.JSONArray"
+  import="org.json.simple.JSONObject"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -173 +173 @@
   %>
   <base:page type="iframe" title="Test with file">
-  <base:head scripts="tabcontrol-2.js,~parse_file.js" styles="table.css,tabcontrol.css" />
+  <base:head scripts="tabcontrol-2.js,~parse_file.js" styles="table.css,tabcontrol.css">
+    <style>
+    #fileData td
+    {
+      white-space: nowrap;
+      max-width: 20em;
+      min-width: 4em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    #fileData td:first-child
+    {
+      font-weight: bold;
+    }
+    .skipped
+    {
+      padding: 1px 2px 1px 2px;
+      color: #777777;
+      font-style: italic;
+    }
+    </style>
+  </base:head>
   <base:body>
   <div class="absolutefull bottomborder">
@@ -216 +237 @@
       <div class="itemlist" style="<%=messages.size()==0 ? "" : "border-top-width: 1px;"%>">
         <div class="data">
-        <table style="border: 0;">
+        <table style="border: 0;" id="fileData">
           <thead class="bg-filled-100">
           <tr>
@@ -234 +255 @@
         int rowClassIndex = 0;
 
-        while (currentLine <= maxLines && currentLine < headerLines)
+        while (currentLine < maxLines && currentLine < headerLines)
         {
           FlatFileParser.Line line = parser.getLine(currentLine);
           linePatterns.add(Pattern.quote(line.line()));
           String[] data = null;
+          int numMoreColumns = 0;
           if (line.type() == FlatFileParser.LineType.HEADER)
           {
@@ -246 +268 @@
           {
             data = parser.trimQuotes(splitter.split(line.line(), 99));
+            if (data.length == 99)
+            {
+              numMoreColumns = splitter.split(line.line()).length - 99;
+            }
           }
           else
@@ -254 +280 @@
           <tr class="<%=rowclass[rowClassIndex]%> highlight">
             <td class="cell"><%=line.lineNo()%></td>
-            <td class="cell"><%=data.length%></td>
+            <td class="cell"><%=data.length+numMoreColumns%></td>
             <td class="cell"><%=line.type()%></td>
             <td class="cell">
@@ -290 +316 @@
         {
           if (lastLine == FlatFileParser.LineType.DATA) parser.nextData();
-          while (currentLine <= maxLines && parser.hasMoreData())
+          while (currentLine < maxLines && parser.hasMoreData())
           {
             FlatFileParser.Data data = parser.nextData();
@@ -298 +324 @@
               %>
               <tr>
-                <td class="error" colspan="103">
+                <td class="skipped bg-filled-100" colspan="103">
                 Skipped <%=parser.getNumSkippedLines()%> lines 
                 (<%=parser.getIgnoredLines()%> ignored; <%=parser.getUnknownLines()%> unknown)
@@ -320 +346 @@
               </td>
               <%
-              for (int i = 0; i < data.columns(); ++i)
+              for (int i = 0; i < data.columns() && i < 99; ++i)
               {
                 %>