cleanup

Author: scott-cotton

cmd/dupi/dupi.go

@@ -26,6 +26,8 @@ import (
 	"github.com/google/gops/agent"
 )
 
+// TBD: write and use newIndex(), newExtract()
+// instead of init() ugliness
 var scMap = map[string]SubCmd{
 	"index":   index,
 	"extract": extract,
@@ -70,7 +72,7 @@ func usage(w io.Writer) {
 	fmt.Fprintf(w, "usage: dupi [global opts] <cmd> <args>\n")
 	fmt.Fprintf(w, "commands are:\n")
 	for k, v := range scMap {
-		fmt.Fprintf(w, "\t%s %-16s\n", k, v.Usage())
+		fmt.Fprintf(w, "\t%s %30s\n", k, v.Usage())
 	}
 	fmt.Fprintf(w, "\nglobal options:\n")
 	gFlags.VisitAll(func(f *flag.Flag) {

cmd/dupi/unblot.go

@@ -57,6 +57,7 @@ func (ub *unblotCmd) Run(args []string) error {
 			m[string(dat)] = append(m[string(dat)], doc)
 		}
 		for k, ds := range m {
+			fmt.Printf("text:\n'''\n%s'''\n", k)
 			for _, d := range ds {
 				fmt.Printf("\t%s %d:%d\n", d.Path, d.Start, d.End)
 			}

internal/shard/index.go

@@ -51,24 +51,24 @@ func (x *Index) Close() error {
 
 func (x *Index) ReadStateFor(blot uint16) *ReadState {
 	/*
-		refCount := x.counts[blot]
-		i := sort.Search(1<<16, func(i int) bool {
-			return x.counts[x.perm[i]] > refCount
-		})
-		if i == len(x.perm) {
-			panic("internal error in perm/count")
-		}
-		if x.perm[i] != blot {
-			fmt.Printf("blot %x i %d perm[%d] %x count %d ref %d %#v\n", blot, i, i, x.perm[i], x.counts[x.perm[i]], refCount, x.perm[i-1:i+2])
-			panic("internal error2 in perm/count")
-		}
+		        broken still
+			refCount := x.counts[blot]
+			i := sort.Search(1<<16, func(i int) bool {
+				return x.counts[x.perm[i]] > refCount
+			})
+			if i == len(x.perm) {
+				panic("internal error in perm/count")
+			}
+			if x.perm[i] != blot {
+				fmt.Printf("blot %x i %d perm[%d] %x count %d ref %d %#v\n", blot, i, i, x.perm[i], x.counts[x.perm[i]], refCount, x.perm[i-1:i+2])
+				panic("internal error2 in perm/count")
+			}
 	*/
 	return x.ReadStateForBlotAt(blot, 0) //uint16(i))
 }
 
 func (x *Index) ReadStateForBlotAt(blot, at uint16) *ReadState {
 	res := &ReadState{}
-	fmt.Printf("head of shard blot %x is %d\n", blot, x.heads[blot])
 	res.Posts = newPosts(x.heads[blot])
 	res.Shard = x.id
 	res.Blot = blot
@@ -111,9 +111,6 @@ func (x *Index) readIix() error {
 		if err != nil {
 			return err
 		}
-		if i == 0xf974 {
-			fmt.Printf("0xf974: head %d count %d\n", hd, ct)
-		}
 		x.counts[i] = uint32(ct)
 		x.perm[i] = uint16(i)
 	}