@@ -542,17 +542,17 @@ data PostingsHighlight = PostingsHighlight (Maybe CommonHighlight) deriving (Sho
542-- This requires that term_vector is set to 'with_positions_offsets' in the mapping.
542-- This requires that term_vector is set to 'with_positions_offsets' in the mapping.
543data FastVectorHighlight =
543data FastVectorHighlight =
544 FastVectorHighlight { fvCommon :: Maybe CommonHighlight
544 FastVectorHighlight { fvCommon :: Maybe CommonHighlight
545+ , fvNonPostSettings :: Maybe NonPostings
545 , boundaryChars :: Maybe Text
546 , boundaryChars :: Maybe Text
546 , boundaryMaxScan :: Maybe Int
547 , boundaryMaxScan :: Maybe Int
547 , fragmentOffset :: Maybe Int
548 , fragmentOffset :: Maybe Int
548 , matchedFields :: [Text]
549 , matchedFields :: [Text]
549− , fvNonPostSettings :: Maybe NonPostings
550 , phraseLimit :: Maybe Int
550 , phraseLimit :: Maybe Int
551 } deriving (Show, Eq)
551 } deriving (Show, Eq)
553data CommonHighlight =
553data CommonHighlight =
554− CommonHighlight {
554+ CommonHighlight { order :: Maybe Text
555− forceSource :: Maybe Bool
555+ , forceSource :: Maybe Bool
556 , tag :: Maybe HighlightTag
556 , tag :: Maybe HighlightTag
557 , encoder :: Maybe HighlightEncoder
557 , encoder :: Maybe HighlightEncoder
558 , noMatchSize :: Maybe Int
558 , noMatchSize :: Maybe Int
@@ -1874,9 +1874,9 @@ postHighPairs (Just (PostingsHighlight pCom)) =
1874fastVectorHighPairs :: Maybe FastVectorHighlight -> [Pair]
1874fastVectorHighPairs :: Maybe FastVectorHighlight -> [Pair]
1875fastVectorHighPairs Nothing = []
1875fastVectorHighPairs Nothing = []
1876fastVectorHighPairs (Just
1876fastVectorHighPairs (Just
1877− (FastVectorHighlight fvCom fvBoundChars fvBoundMaxScan
1877+ (FastVectorHighlight fvCom fvNonPostSettings fvBoundChars
1878− fvFragOff fvMatchedFields
1878+ fvBoundMaxScan fvFragOff fvMatchedFields
1879− fvNonPostSettings fvPhraseLim)) =
1879+ fvPhraseLim)) =
1880 [ "type" .= String "fvh"
1880 [ "type" .= String "fvh"
1881 , "boundary_chars" .= fvBoundChars
1881 , "boundary_chars" .= fvBoundChars
1882 , "boundary_max_scan" .= fvBoundMaxScan
1882 , "boundary_max_scan" .= fvBoundMaxScan
@@ -1888,10 +1888,11 @@ fastVectorHighPairs (Just
1889commonHighlightPairs :: Maybe CommonHighlight -> [Pair]
1889commonHighlightPairs :: Maybe CommonHighlight -> [Pair]
1890commonHighlightPairs Nothing = []
1890commonHighlightPairs Nothing = []
1891−commonHighlightPairs (Just (CommonHighlight chForceSource chTag chEncoder
1891+commonHighlightPairs (Just (CommonHighlight chScore chForceSource chTag chEncoder
1892 chNoMatchSize chHighlightQuery
1892 chNoMatchSize chHighlightQuery
1893 chRequireFieldMatch)) =
1893 chRequireFieldMatch)) =
1894+ [ "order" .= chScore
1894− [ "force_source" .= chForceSource
1895+ , "force_source" .= chForceSource
1895 , "encoder" .= chEncoder
1896 , "encoder" .= chEncoder
1896 , "no_match_size" .= chNoMatchSize
1897 , "no_match_size" .= chNoMatchSize
1897 , "highlight_query" .= chHighlightQuery
1898 , "highlight_query" .= chHighlightQuery