on master help sign in
Improved search
commit16465c3ffc0ec38d772a0eddd8814242e58c5fc4 authoriko <ilyakooo0@gmail.com> dateSun 12 May 2019, 15:29 (7 years ago) parentd67e101
1 file changed+10−2
denis/src/Data/Query.hs+10−2
denis/src/Data/Query.hs+10−2
@@ -542,13 +542,21 @@ getGroupChatForUserQ = selectStar $
542542getFacultySearchResultQ :: Query Schema (TuplePG (Only Text)) (RowPG Faculty)
543543getFacultySearchResultQ = selectStar (from (table #faculties) &
544544 where_ (vector @@ query) &
545− orderBy [tsRankCd vector query & Desc])
545+ orderBy [
546+ tsRankCd vector1 query & Desc,
547+ tsRankCd vector2 query & Desc,
548+ tsRankCd vector query & Desc
549+ ])
546550 where
547551 vector = tsVector "russian" (textArrayToText [
548552 #facultyName,
549553 #facultyPath,
550554 #facultyCampusName,
551555 (arrayToText #facultyTags)])
556+ vector1 = tsVector "russian" #facultyName
557+ vector2 = tsVector "russian" (textArrayToText [
558+ #facultyName,
559+ #facultyPath])
552560 query = tsQuery "russian" (param @1)
553561
554562searchUsersQ :: Query Schema (TuplePG (Only Text)) (RowPG UserRow)
@@ -610,7 +618,7 @@ tsRankCd
610618 -> Expression schema from grouping params ('NotNull 'PGtext)
611619 -> Expression schema from grouping params ('NotNull 'PGfloat4)
612620tsRankCd vector query = UnsafeExpression $
613− "ts_rank_cd" <> parenthesized (commaSeparated . map renderExpression $ [vector, query])
621+ "ts_rank_cd" <> parenthesized (commaSeparated ["ARRAY[1,1,1,1]", renderExpression vector, renderExpression query, "2|4|8|16|32"])
614622
615623tsVector
616624 :: ByteString -- ^ Language