Allow setting separate multimer search options

soedinglab · Apr 29, 2024 · 199ce4c · 199ce4c
1 parent 7dd0001
commit 199ce4c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/backend/databases.go b/backend/databases.go
@@ -25,6 +25,7 @@ type Params struct {
 	FullHeader bool   `json:"full_header"`
 	Index      string `json:"index"`
 	Search     string `json:"search"`
+	Multimer   string `json:"multimer"`
 	Status     Status `json:"status"`
 }
 
@@ -177,6 +178,7 @@ func UpgradeParams(filename string) (Params, error) {
 	paramsNew.Order = paramsOld.Display.Order
 	paramsNew.Index = paramsOld.Display.Index
 	paramsNew.Search = paramsOld.Display.Search
+	paramsNew.Multimer = ""
 	paramsNew.Status = paramsOld.Status
 
 	err = SaveParams(filename, paramsNew)

diff --git a/backend/server.go b/backend/server.go
@@ -201,6 +201,7 @@ func server(jobsystem JobSystem, config ConfigRoot) {
 				false,
 				req.FormValue("index"),
 				req.FormValue("search"),
+				"",
 				StatusPending,
 			}
 

diff --git a/backend/worker.go b/backend/worker.go
@@ -504,7 +504,13 @@ mv -f -- "${BASE}/query.lookup_tmp" "${BASE}/query.lookup"
 					"--complex-report-mode",
 					"0",
 				}
-				parameters = append(parameters, strings.Fields(params.Search)...)
+
+				par := params.Search
+				if params.Multimer != "" {
+					par = params.Multimer
+				}
+
+				parameters = append(parameters, strings.Fields(par)...)
 
 				if job.Mode == "summary" {
 					parameters = append(parameters, "--greedy-best-hits")
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,6 +201,7 @@ func server(jobsystem JobSystem, config ConfigRoot) { @@
     				false,
     				req.FormValue("index"),
     				req.FormValue("search"),
+    				"",
     				StatusPending,
     			}
@@ Expand Down @@