Skip to content

Commit 4c28b96

Browse files
michaelwenkmichaelwenk
committed
chore: mute prints in api-impl.go
1 parent 41ba6f0 commit 4c28b96

File tree

1 file changed

+29
-30
lines changed

1 file changed

+29
-30
lines changed

‎cmd/mb3server/src/api-impl.go

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package mb3server
33
import (
44
"bytes"
55
"encoding/json"
6-
"fmt"
76
"net/http"
87
"os"
98
"sort"
@@ -634,7 +633,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
634633
accessionsSubstructureSearch := []string{}
635634
checkSubstructure := substructure != ""
636635
if checkSubstructure {
637-
fmt.Println(" -> filter by substructure")
636+
// fmt.Println(" -> filter by substructure")
638637
var atomCountsSubstructureSearch []int32
639638
accessionsSubstructureSearch, atomCountsSubstructureSearch, err = db.GetAccessionsBySubstructure(substructure)
640639
if err != nil {
@@ -644,7 +643,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
644643
setSubstructureSearch.Add(accession)
645644
atomCountResultMap[accession] = atomCountsSubstructureSearch[i]
646645
}
647-
fmt.Println("recordsSubstructureSearch: ", len(accessionsSubstructureSearch))
646+
// fmt.Println("recordsSubstructureSearch: ", len(accessionsSubstructureSearch))
648647
}
649648

650649
// similarity search
@@ -654,7 +653,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
654653
similaritySearchResult := &SimilaritySearchResult{}
655654
checkSimilarity := len(peakList) > 0 && peakList[0] != ""
656655
if checkSimilarity {
657-
fmt.Println(" -> filter by Similarity")
656+
// fmt.Println(" -> filter by Similarity")
658657
similaritySearchResult, err = GetSimilarity(peakList, []string{}, 0, peakListThreshold)
659658
if err != nil {
660659
return nil, err
@@ -664,15 +663,15 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
664663
similarityResultMap[similarityResult.Accession] = similarityResult.Score
665664
atomCountResultMap[similarityResult.Accession] = similarityResult.Atomcount
666665
}
667-
fmt.Println("similaritySearchResult: ", len(similaritySearchResult.Data))
666+
// fmt.Println("similaritySearchResult: ", len(similaritySearchResult.Data))
668667
}
669668

670669
// filter search
671670
filters, err := buildFilters(instrumentType, splash, msType, ionMode, compoundName, compoundClass, exactMass, massTolerance, formula, peaks, intensity, neutralLoss, inchi, inchiKey, contributor)
672671
if err != nil {
673672
return nil, err
674673
}
675-
fmt.Println("filters: ", filters)
674+
// fmt.Println("filters: ", filters)
676675

677676
// neutral loss search, only if filters.NeutralLoss is given
678677
checkNeutralLoss := filters.NeutralLoss != nil && len(*filters.NeutralLoss) > 0 && filters.MassEpsilon != nil
@@ -681,7 +680,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
681680
neutralLossResultMap := make(map[string][]string)
682681
accessionsNeutralLossSearch := []string{}
683682
if checkNeutralLoss {
684-
fmt.Println(" -> filter by NeutralLoss")
683+
// fmt.Println(" -> filter by NeutralLoss")
685684
var atomCountsNeutralLossSearch []int32
686685
var peakPairs map[string][]string
687686
accessionsNeutralLossSearch, atomCountsNeutralLossSearch, peakPairs, err = db.NeutralLossSearch(filters.NeutralLoss, filters.MassEpsilon, filters.Intensity)
@@ -707,7 +706,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
707706

708707
accessionsFilters := []string{}
709708
if checkFilters {
710-
fmt.Println(" -> filter by Filters")
709+
// fmt.Println(" -> filter by Filters")
711710
var atomCountsFilters []int32
712711
accessionsFilters, atomCountsFilters, err = db.GetAccessionsByFilterOptions(*filters)
713712
if err != nil {
@@ -717,15 +716,15 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
717716
setFilterSearch.Add(accession)
718717
atomCountResultMap[accession] = atomCountsFilters[i]
719718
}
720-
fmt.Println("recordsFilters: ", len(accessionsFilters))
719+
// fmt.Println("recordsFilters: ", len(accessionsFilters))
721720
}
722721

723722
// merge search results
724723
results := &SearchResult{}
725724
results.Data = []SearchResultDataInner{}
726725

727726
if checkSubstructure && checkSimilarity && checkNeutralLoss && checkFilters {
728-
fmt.Println(" -> combined results (substructure + similarity + neutral loss + filters)")
727+
// fmt.Println(" -> combined results (substructure + similarity + neutral loss + filters)")
729728
intersection := setSubstructureSearch.Intersect(setSimilaritySearch).Intersect(setNeutralLossSearch).Intersect(setFilterSearch)
730729
for _, accession := range intersection.ToSlice() {
731730
var peakPairs []string
@@ -746,7 +745,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
746745
return results.Data[i].Score > results.Data[j].Score
747746
})
748747
} else if checkSubstructure && checkSimilarity && checkNeutralLoss && !checkFilters {
749-
fmt.Println(" -> combined results (substructure + similarity + neutral loss)")
748+
// fmt.Println(" -> combined results (substructure + similarity + neutral loss)")
750749
intersection := setSubstructureSearch.Intersect(setSimilaritySearch).Intersect(setNeutralLossSearch)
751750
for _, accession := range intersection.ToSlice() {
752751
var peakPairs []string
@@ -767,7 +766,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
767766
return results.Data[i].Score > results.Data[j].Score
768767
})
769768
} else if checkSubstructure && checkSimilarity && !checkNeutralLoss && checkFilters {
770-
fmt.Println(" -> combined results (substructure + similarity + filters)")
769+
// fmt.Println(" -> combined results (substructure + similarity + filters)")
771770
intersection := setSubstructureSearch.Intersect(setSimilaritySearch).Intersect(setFilterSearch)
772771
for _, accession := range intersection.ToSlice() {
773772
searchResultData := SearchResultDataInner{
@@ -781,7 +780,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
781780
return results.Data[i].Score > results.Data[j].Score
782781
})
783782
} else if checkSubstructure && !checkSimilarity && checkNeutralLoss && checkFilters {
784-
fmt.Println(" -> combined results (substructure + neutral loss + filters)")
783+
// fmt.Println(" -> combined results (substructure + neutral loss + filters)")
785784
intersection := setSubstructureSearch.Intersect(setNeutralLossSearch).Intersect(setFilterSearch)
786785
for _, accession := range intersection.ToSlice() {
787786
var peakPairs []string
@@ -798,7 +797,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
798797
results.Data = append(results.Data, searchResultData)
799798
}
800799
} else if !checkSubstructure && checkSimilarity && checkNeutralLoss && checkFilters {
801-
fmt.Println(" -> combined results (similarity + neutral loss + filters)")
800+
// fmt.Println(" -> combined results (similarity + neutral loss + filters)")
802801
intersection := setSimilaritySearch.Intersect(setNeutralLossSearch).Intersect(setFilterSearch)
803802
for _, accession := range intersection.ToSlice() {
804803
var peakPairs []string
@@ -819,7 +818,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
819818
return results.Data[i].Score > results.Data[j].Score
820819
})
821820
} else if checkSubstructure && checkSimilarity && !checkNeutralLoss && !checkFilters {
822-
fmt.Println(" -> combined results (substructure + similarity)")
821+
// fmt.Println(" -> combined results (substructure + similarity)")
823822
intersection := setSubstructureSearch.Intersect(setSimilaritySearch)
824823
for _, accession := range intersection.ToSlice() {
825824
searchResultData := SearchResultDataInner{
@@ -833,7 +832,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
833832
return results.Data[i].Score > results.Data[j].Score
834833
})
835834
} else if checkSubstructure && !checkSimilarity && checkNeutralLoss && !checkFilters {
836-
fmt.Println(" -> combined results (substructure + neutral loss)")
835+
// fmt.Println(" -> combined results (substructure + neutral loss)")
837836
intersection := setSubstructureSearch.Intersect(setNeutralLossSearch)
838837
for _, accession := range intersection.ToSlice() {
839838
var peakPairs []string
@@ -850,7 +849,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
850849
results.Data = append(results.Data, searchResultData)
851850
}
852851
} else if !checkSubstructure && checkSimilarity && checkNeutralLoss && !checkFilters {
853-
fmt.Println(" -> combined results (similarity + neutral loss)")
852+
// fmt.Println(" -> combined results (similarity + neutral loss)")
854853
intersection := setSimilaritySearch.Intersect(setNeutralLossSearch)
855854
for _, accession := range intersection.ToSlice() {
856855
var peakPairs []string
@@ -871,7 +870,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
871870
return results.Data[i].Score > results.Data[j].Score
872871
})
873872
} else if checkSubstructure && !checkSimilarity && !checkNeutralLoss && checkFilters {
874-
fmt.Println(" -> combined results (substructure + filters)")
873+
// fmt.Println(" -> combined results (substructure + filters)")
875874
intersection := setSubstructureSearch.Intersect(setFilterSearch)
876875
for _, accession := range intersection.ToSlice() {
877876
searchResultData := SearchResultDataInner{
@@ -881,7 +880,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
881880
results.Data = append(results.Data, searchResultData)
882881
}
883882
} else if !checkSubstructure && checkSimilarity && !checkNeutralLoss && checkFilters {
884-
fmt.Println(" -> combined results (similarity + filters)")
883+
// fmt.Println(" -> combined results (similarity + filters)")
885884
intersection := setSimilaritySearch.Intersect(setFilterSearch)
886885
for _, accession := range intersection.ToSlice() {
887886
searchResultData := SearchResultDataInner{
@@ -895,7 +894,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
895894
return results.Data[i].Score > results.Data[j].Score
896895
})
897896
} else if !checkSubstructure && !checkSimilarity && checkNeutralLoss && checkFilters {
898-
fmt.Println(" -> combined results (neutral loss + filters)")
897+
// fmt.Println(" -> combined results (neutral loss + filters)")
899898
intersection := setNeutralLossSearch.Intersect(setFilterSearch)
900899
for _, accession := range intersection.ToSlice() {
901900
var peakPairs []string
@@ -912,9 +911,9 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
912911
results.Data = append(results.Data, searchResultData)
913912
}
914913
} else {
915-
fmt.Println("no combined results found -> single results")
914+
// fmt.Println("no combined results found -> single results")
916915
if checkSimilarity && !checkFilters && !checkSubstructure && !checkNeutralLoss {
917-
fmt.Println(" -> single results (similarity)")
916+
// fmt.Println(" -> single results (similarity)")
918917
for _, similarityResult := range similaritySearchResult.Data {
919918
results.Data = append(results.Data, SearchResultDataInner{
920919
Accession: similarityResult.Accession,
@@ -923,7 +922,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
923922
})
924923
}
925924
} else if checkFilters && !checkSimilarity && !checkSubstructure && !checkNeutralLoss {
926-
fmt.Println(" -> single results (filters)")
925+
// fmt.Println(" -> single results (filters)")
927926
for _, accession := range accessionsFilters {
928927
var peakPairs []string
929928
if _, ok := neutralLossResultMap[accession]; ok {
@@ -939,7 +938,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
939938
results.Data = append(results.Data, searchResultData)
940939
}
941940
} else if checkSubstructure && !checkSimilarity && !checkFilters && !checkNeutralLoss {
942-
fmt.Println(" -> single results (substructure)")
941+
// fmt.Println(" -> single results (substructure)")
943942
for _, accession := range accessionsSubstructureSearch {
944943
searchResultData := SearchResultDataInner{
945944
Accession: accession,
@@ -948,7 +947,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
948947
results.Data = append(results.Data, searchResultData)
949948
}
950949
} else if checkNeutralLoss && !checkSimilarity && !checkFilters && !checkSubstructure {
951-
fmt.Println(" -> single results (neutral loss)")
950+
// fmt.Println(" -> single results (neutral loss)")
952951
for _, accession := range accessionsNeutralLossSearch {
953952
var peakPairs []string
954953
if _, ok := neutralLossResultMap[accession]; ok {
@@ -966,7 +965,7 @@ func GetSearchResults(instrumentType []string, splash string, msType []string, i
966965
}
967966
}
968967

969-
fmt.Println("results: ", len(results.Data))
968+
// fmt.Println("results: ", len(results.Data))
970969

971970
return results, nil
972971
}
@@ -992,10 +991,10 @@ func GetSimilarity(peakList []string, referenceSpectraList []string, limit int32
992991
}
993992
return mz1 < mz2
994993
})
995-
fmt.Println("peakList: ", peakList)
996-
fmt.Println("referenceSpectraList: ", referenceSpectraList)
997-
fmt.Println("limit: ", limit)
998-
fmt.Println("threshold: ", threshold)
994+
// fmt.Println("peakList: ", peakList)
995+
// fmt.Println("referenceSpectraList: ", referenceSpectraList)
996+
// fmt.Println("limit: ", limit)
997+
// fmt.Println("threshold: ", threshold)
999998

1000999
if err := initDB(); err != nil {
10011000
return nil, err

0 commit comments

Comments
 (0)