Commit 28dd57d

committed

Moving SearchTermsFromQueryString into proper place

1 parent ebb55e3 commit 28dd57dCopy full SHA for 28dd57d

File tree

+12

-33

lines changed

+12

-33

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,16 @@ func removeDiatrics(s string) (string, error) {`
`43`	`43`	`return s, nil`
`44`	`44`	`}`
`45`	`45`
	`46`	`+// SearchTermsFromQueryString returns the terms inside the query string.`
	`47`	`+// All non alphanumeric characters (expect ':') are considered separators.`
	`48`	`+// All search terms are converted to lowercase.`
	`49`	`+func SearchTermsFromQueryString(query string) []string {`
	`50`	`+ // Split on anything but 0-9, a-z or :`
	`51`	`+ return strings.FieldsFunc(strings.ToLower(query), func(r rune) bool {`
	`52`	`+ return !unicode.IsLetter(r) && !unicode.IsNumber(r) && r != ':'`
	`53`	`+ })`
	`54`	`+}`
	`55`	`+`
`46`	`56`	`// Match returns true if all substrings are contained in str.`
`47`	`57`	`// Both str and substrings are transforms to lower case and have their`
`48`	`58`	`// accents and other unicode diatrics removed.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func PlatformSearch(req rpc.PlatformSearchRequest) (rpc.PlatformSearchResponse`
`40`	`40`	`vid, pid := req.SearchArgs[:4], req.SearchArgs[5:]`
`41`	`41`	`res = pme.FindPlatformReleaseProvidingBoardsWithVidPid(vid, pid)`
`42`	`42`	`} else {`
`43`		`- searchArgs := rpc.SearchTermsFromQueryString(req.SearchArgs)`
	`43`	`+ searchArgs := utils.SearchTermsFromQueryString(req.SearchArgs)`
`44`	`44`	`allVersions := req.AllVersions`
`45`	`45`	`for _, targetPackage := range pme.GetPackages() {`
`46`	`46`	`for _, platform := range targetPackage.Platforms {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func LibrarySearch(ctx context.Context, req rpc.LibrarySearchRequest) (rpc.Lib`
`38`	`38`
`39`	`39`	`func searchLibrary(req rpc.LibrarySearchRequest, lm librariesmanager.LibrariesManager) *rpc.LibrarySearchResponse {`
`40`	`40`	`res := []*rpc.SearchedLibrary{}`
`41`		`- queryTerms := rpc.SearchTermsFromQueryString(req.GetQuery())`
	`41`	`+ queryTerms := utils.SearchTermsFromQueryString(req.GetQuery())`
`42`	`42`
`43`	`43`	`for _, lib := range lm.Index.Libraries {`
`44`	`44`	`toTest := lib.Name + " " +`

Lines changed: 0 additions & 31 deletions

This file was deleted.

Comments

(0)