specify index, remove --dev

main.go

@@ -21,10 +21,10 @@ const (
 	defaultHost    = "0.0.0.0"
 	defaultPort    = "50051"
 	defaultEsHost  = "http://localhost"
+	defaultEsIndex = "claims"
 	defaultEsPort  = "9200"
 )
 
-
 func GetEnvironment(data []string, getkeyval func(item string) (key, val string)) map[string]string {
 	items := make(map[string]string)
 	for _, item := range data {
@@ -53,8 +53,8 @@ func parseArgs(searchRequest *pb.SearchRequest) *server.Args {
 	host := parser.String("", "rpchost", &argparse.Options{Required: false, Help: "host", Default: defaultHost})
 	port := parser.String("", "rpcport", &argparse.Options{Required: false, Help: "port", Default: defaultPort})
 	esHost := parser.String("", "eshost", &argparse.Options{Required: false, Help: "host", Default: defaultEsHost})
+	esIndex := parser.String("", "esindex", &argparse.Options{Required: false, Help: "host", Default: defaultEsIndex})
 	esPort := parser.String("", "esport", &argparse.Options{Required: false, Help: "port", Default: defaultEsPort})
-	dev := parser.Flag("", "dev", &argparse.Options{Required: false, Help: "port", Default: false})
 
 	text := parser.String("", "text", &argparse.Options{Required: false, Help: "text query"})
 	name := parser.String("", "name", &argparse.Options{Required: false, Help: "name"})
@@ -72,14 +72,13 @@ func parseArgs(searchRequest *pb.SearchRequest) *server.Args {
 		log.Fatalln(parser.Usage(err))
 	}
 
-
 	args := &server.Args{
 		Serve:   false,
 		Host:    *host,
 		Port:    ":" + *port,
 		EsHost:  *esHost,
 		EsPort:  *esPort,
-		Dev: *dev,
+		EsIndex: *esIndex,
 	}
 
 	if esHost, ok := environment["ELASTIC_HOST"]; ok {
@@ -174,7 +173,6 @@ func main() {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
-
 	r, err := c.Search(ctx, searchRequest)
 	if err != nil {
 		log.Fatal(err)

server/search.go

@@ -153,27 +153,13 @@ func (s *Server) Search(ctx context.Context, in *pb.SearchRequest) (*pb.Outputs,
 	var pageSize = 10
 	var orderBy []orderField
 	var searchIndices = []string{}
+	searchIndices = make([]string, 0, 1)
+	searchIndices = append(searchIndices, s.Args.EsIndex)
 
 	q := elastic.NewBoolQuery()
 
 	q = s.setupEsQuery(q, in, &pageSize, &from, &orderBy)
 
-	if s.Args.Dev && len(in.SearchIndices) == 0 {
-		// If we're running in dev mode ignore the mainnet claims index
-		indices, err := client.IndexNames()
-		if err != nil {
-			log.Fatalln(err)
-		}
-		var numIndices = len(indices)
-		searchIndices = make([]string, 0, numIndices)
-		for i := 0; i < numIndices; i++ {
-			if indices[i] == "claims" {
-				continue
-			}
-			searchIndices = append(searchIndices, indices[i])
-		}
-	}
-
 	if len(in.SearchIndices) > 0 {
 		searchIndices = in.SearchIndices
 	}
@@ -185,7 +171,6 @@ func (s *Server) Search(ctx context.Context, in *pb.SearchRequest) (*pb.Outputs,
 		Query(q). // specify the query
 		From(0).Size(DefaultSearchSize)
 
-
 	for _, x := range orderBy {
 		search = search.Sort(x.Field, x.IsAsc)
 	}

server/server.go

@@ -24,7 +24,7 @@ type Args struct {
 	Port    string
 	EsHost  string
 	EsPort  string
-	Dev bool
+	EsIndex string
 }
 
 /*