From 433c5350958bcff798532c33825d6e925773b76e Mon Sep 17 00:00:00 2001 From: Jay Taylor Date: Wed, 6 Jun 2018 21:37:37 -0700 Subject: [PATCH] Fixed compilation errors. Package is now go-gettable and buildable with current imports. --- tools/countdocs/countdocs.go | 3 ++- tools/dump/dump.go | 11 ++++++----- tools/fillfound/fillfound.go | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/countdocs/countdocs.go b/tools/countdocs/countdocs.go index 9ce804d..9198572 100644 --- a/tools/countdocs/countdocs.go +++ b/tools/countdocs/countdocs.go @@ -1,6 +1,7 @@ package main import ( + "io" "log" "github.com/golangplus/fmt" @@ -31,7 +32,7 @@ func main() { var val gcse.DocInfo for { if err := it.Next(&key, &val); err != nil { - if err == sophie.EOF { + if err == io.EOF { break } log.Fatalf("it.Next failed %v", err) diff --git a/tools/dump/dump.go b/tools/dump/dump.go index 95c81d5..160a64e 100644 --- a/tools/dump/dump.go +++ b/tools/dump/dump.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "io" "log" "os" @@ -53,7 +54,7 @@ func dumpDocs(keys []string) { for { if err := it.Next(&key, &val); err != nil { - if err == sophie.EOF { + if err == io.EOF { break } log.Fatalf("it.Next failed %v", err) @@ -71,13 +72,13 @@ func dumpDocs(keys []string) { } func dumpIndex(keys []string) { - segm, err := gcse.IndexSegments.FindMaxDone() - if segm == nil || err != nil { - log.Fatalf("gcse.IndexSegments.FindMaxDone() failed: %v", err) + segm, err := configs.IndexSegments().FindMaxDone() + if err != nil || segm == "" { + log.Fatalf("configs.IndexSegments().FindMaxDone() failed: %v", err) } db := &index.TokenSetSearcher{} - f, err := segm.Join(gcse.IndexFn).Open() + f, err := os.Open(segm.Join(gcse.IndexFn)) if err != nil { log.Fatalf("%v.Join(%s).Open() failed: %v", segm, gcse.IndexFn, err) } diff --git a/tools/fillfound/fillfound.go b/tools/fillfound/fillfound.go index c53ac10..39bef88 100644 --- a/tools/fillfound/fillfound.go +++ b/tools/fillfound/fillfound.go @@ -9,7 +9,7 @@ import ( "github.com/daviddengcn/gcse/store" "github.com/daviddengcn/gcse/utils" - sppb "github.com/daviddengcn/gcse/proto/spider" + "github.com/daviddengcn/gcse/shared/proto" ) func doFill() error { @@ -21,7 +21,7 @@ func doFill() error { return nil } site, path := utils.SplitPackage(pkg) - return store.AppendPackageEvent(site, path, "unknown", ent.ScheduleTime.Add(-10*timep.Day), sppb.HistoryEvent_Action_None) + return store.AppendPackageEvent(site, path, "unknown", ent.ScheduleTime.Add(-10*timep.Day), gcsepb.HistoryEvent_Action_None) }) }