rm old stuff

1 files changed, 4 insertions, 89 deletions

diff --git a/tablePB.go b/tablePB.go
index ab1f74a..4d42c32 100644
--- a/tablePB.go
+++ b/tablePB.go
@@ -27,8 +27,6 @@ func PrintTable(pb *guipb.Table) {
 		TERMSIZE = cursize
 	}
 
-	var h int = 0
-	var w int = 0
 	var HEIGHT int
 	if pb.Height == 0 {
 		HEIGHT = 4
@@ -36,8 +34,8 @@ func PrintTable(pb *guipb.Table) {
 	// log.Info("pb.Height", pb.Height, HEIGHT)
 	var args []string
 	var sizes []int
-	for _, name := range pb.Order {
-		arg, attr, tmp := getColAttr(pb, name)
+	for _, col := range pb.AnyCols {
+		arg, attr, tmp := getColAttr(pb, col.Header.Name)
 		if attr == nil {
 			continue
 		}
@@ -56,19 +54,9 @@ func PrintTable(pb *guipb.Table) {
 
 	for i := range HEIGHT {
 		var cells []string
-		for _, name := range pb.Order {
-			if val, ok := getAnyCell(pb, name, int(i)); ok {
-				h += 1
+		for _, col := range pb.AnyCols {
+			if val, ok := getAnyCell(pb, col.Header.Name, int(i)); ok {
 				cells = append(cells, val)
-				continue
-			}
-			if val, ok := getTableCell(pb, name, int(i)); ok {
-				// log.Info("tree: CELL GOOD", pb.Title, name, w, h, val)
-				h += 1
-				cells = append(cells, val)
-			} else {
-				log.Info("tree: CELL FAIL", pb.Title, name, w, h, val)
-				cells = append(cells, "err")
 			}
 		}
 		line, fmtline := StandardTableRow(sizes, cells)
@@ -91,52 +79,6 @@ func extractInt64(anyVal *anypb.Any) (int64, error) {
 	return val.Value, nil
 }
 
-func getTableCell(t *guipb.Table, name string, row int) (string, bool) {
-	// find the Column that matches the "name"
-	for _, r := range t.StringCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("Cell value:", r.Vals[row])
-		return r.Vals[row], true
-	}
-	for _, r := range t.ButtonCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("Cell value:", r.Vals[row])
-		return r.Vals[row], true
-	}
-	for _, r := range t.IntCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		return fmt.Sprintf("%d", r.Vals[row]), true
-	}
-	for _, r := range t.TimeCols {
-		if name != r.Header.Name {
-			// log.Info("skip sint row:", r.Header.Name, "!=", name)
-			continue
-		}
-		cellTime := r.Vals[row]
-		s := shell.FormatDuration(time.Since(cellTime.AsTime()))
-		return s, true
-	}
-	for _, r := range t.AnyCols {
-		if name != r.Header.Name {
-			// log.Info("skip sint row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// cellTime := r.Vals[row]
-		// s := shell.FormatDuration(time.Since(cellTime.AsTime()))
-		return "fixme", true
-	}
-	return "", false
-}
-
 func getAnyCell(t *guipb.Table, name string, row int) (string, bool) {
 	for _, col := range t.AnyCols {
 		if name != col.Header.Name {
@@ -193,33 +135,6 @@ func getAnyCell(t *guipb.Table, name string, row int) (string, bool) {
 
 func getColAttr(t *guipb.Table, name string) (string, *guipb.ColAttr, int) {
 	// find the Column that matches the "name"
-	for _, r := range t.StringCols {
-		if name != r.Header.Name {
-			continue
-		}
-		return r.Header.Name, r.Attr, len(r.Vals)
-	}
-	for _, r := range t.ButtonCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		return r.Header.Name, r.Attr, len(r.Vals)
-	}
-	for _, r := range t.IntCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		return r.Header.Name, r.Attr, len(r.Vals)
-	}
-	for _, r := range t.TimeCols {
-		if name != r.Header.Name {
-			// log.Info("skip sint row:", r.Header.Name, "!=", name)
-			continue
-		}
-		return r.Header.Name, r.Attr, len(r.Vals)
-	}
 	for _, r := range t.AnyCols {
 		if name != r.Header.Name {
 			// log.Info("skip sint row:", r.Header.Name, "!=", name)