honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't consider header width if not printed.

This commit is contained in:
Andrew Raines 2013-07-04 15:39:20 -05:00
parent 2bb681466c
commit bcacbff096
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/elasticsearch/rest/action/support/RestTable.java
View File

@ -66,10 +66,10 @@ public class RestTable {
}
public static RestResponse buildTextPlainResponse(Table table, RestRequest request, RestChannel channel) {
int[] width = buildWidths(table, request);
boolean verbose = request.paramAsBoolean("v", true);
int[] width = buildWidths(table, request, verbose);
Set<String> displayHeaders = buildDisplayHeaders(table, request);
boolean verbose = request.paramAsBoolean("v", true);
StringBuilder out = new StringBuilder();
if (verbose) {
// print the headers
@ -113,13 +113,16 @@ public class RestTable {
return display;
}
private static int[] buildWidths(Table table, RestRequest request) {
private static int[] buildWidths(Table table, RestRequest request, boolean verbose) {
int[] width = new int[table.getHeaders().size()];
for (int col = 0; col < width.length; col++) {
String v = renderValue(request, table.getHeaders().get(col).value);
int vWidth = v == null ? 0 : v.length();
if (width[col] < vWidth) {
width[col] = vWidth;
if (verbose) {
for (int col = 0; col < width.length; col++) {
String v = renderValue(request, table.getHeaders().get(col).value);
int vWidth = v == null ? 0 : v.length();
if (width[col] < vWidth) {
width[col] = vWidth;
}
}
}