Changed lookup logic for interface search

Author: rachelse

backend/config.go

@@ -389,9 +389,9 @@ func (c *ConfigRoot) CheckPaths() error {
 		if _, err := os.Stat(c.Paths.FoldDisco); err != nil {
 			return errors.New("FoldDisco binary was not found at " + c.Paths.FoldDisco)
 		}
-		// if _, err := os.Stat(c.Paths.FoldseekInterface); err != nil {
-		// 	return errors.New("FoldseekInterface binary was not found at " + c.Paths.FoldseekInterface)
-		// }
+		if _, err := os.Stat(c.Paths.FoldseekInterface); err != nil {
+			return errors.New("FoldseekInterface binary was not found at " + c.Paths.FoldseekInterface)
+		}
 	} else if _, err := os.Stat(c.Paths.Mmseqs); err != nil {
 		return errors.New("MMseqs2 binary was not found at " + c.Paths.Mmseqs)
 	}

backend/lookup.go

@@ -32,7 +32,7 @@ func Lookup(ticketId Id, page uint64, limit uint64, basepath string, shouldGroup
 		return LookupResponse{}, err
 	}
 
-	isComplex := request.Type == JobComplexSearch && shouldGroup
+	isComplex := request.Type == JobComplexSearch || request.Type == JobInterfaceSearch && shouldGroup
 
 	results := make([]LookupResult, 0)
 	res := LookupResult{}

backend/worker.go

@@ -847,8 +847,6 @@ mv -f -- "${BASE}/query.lookup_tmp" "${BASE}/query.lookup"
 					"--db-output",
 					"--db-load-mode",
 					"2",
-					"--write-lookup",
-					"1",
 					"--format-output",
 					columns,
 					"--complex-report-mode",
@@ -907,7 +905,7 @@ mv -f -- "${BASE}/query.lookup_tmp" "${BASE}/query.lookup"
 			[]string{
 				config.Paths.Foldseek,
 				"mvdb",
-				filepath.Join(resultBase, "tmp0", "latest", "query_h"),
+				filepath.Join(resultBase, "tmp0", "latest", "interfacedb_query_h"),
 				filepath.Join(resultBase, "query_h"),
 			},
 			[]string{},
@@ -921,7 +919,7 @@ mv -f -- "${BASE}/query.lookup_tmp" "${BASE}/query.lookup"
 			[]string{
 				config.Paths.Foldseek,
 				"mvdb",
-				filepath.Join(resultBase, "tmp0", "latest", "query"),
+				filepath.Join(resultBase, "tmp0", "latest", "interfacedb_query"),
 				filepath.Join(resultBase, "query"),
 			},
 			[]string{},
@@ -930,6 +928,19 @@ mv -f -- "${BASE}/query.lookup_tmp" "${BASE}/query.lookup"
 		if err != nil {
 			return &JobExecutionError{err}
 		}
+		err = execCommandSync(
+			config.Verbose,
+			[]string{
+				"mv",
+				filepath.Join(resultBase, "tmp0", "latest", "dimerdb_query.lookup"),
+				filepath.Join(resultBase, "query.lookup"),
+			},
+			[]string{},
+			1*time.Minute,
+		)
+		if err != nil {
+			return &JobExecutionError{err}
+		}
 		for index, _ := range job.Database {
 			err := os.RemoveAll(filepath.Join(resultBase, "tmp"+strconv.Itoa(index)))
 			if err != nil {