git.iko.soy/typeable/bloodhound
on master help sign in
Change type of 'candidateGenerator' to just be a list.
383eb7eJosh Berman
src/Database/V5/Bloodhound/Types.hs+7−4
@@ -5295,7 +5295,7 @@ data PhraseSuggester =
5295 , phraseSuggesterShardSize :: Maybe Int
5295 , phraseSuggesterShardSize :: Maybe Int
5296 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter
5296 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter
5297 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate
5297 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate
5298− , phraseSuggesterCandidateGenerators :: Maybe [DirectGenerators]
5298+ , phraseSuggesterCandidateGenerators :: [DirectGenerators]
5299 }
5299 }
5300 deriving (Show, Generic, Eq, Read)
5300 deriving (Show, Generic, Eq, Read)
5301
5301
@@ -5328,12 +5328,12 @@ instance FromJSON PhraseSuggester where
5328 <*> o .:? "shard_size"
5328 <*> o .:? "shard_size"
5329 <*> o .:? "highlight"
5329 <*> o .:? "highlight"
5330 <*> o .:? "collate"
5330 <*> o .:? "collate"
5331− <*> o .:? "direct_generator"
5331+ <*> o .:? "direct_generator" .!= []
5332
5332
5333mkPhraseSuggester :: FieldName -> PhraseSuggester
5333mkPhraseSuggester :: FieldName -> PhraseSuggester
5334mkPhraseSuggester fName =
5334mkPhraseSuggester fName =
5335 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing
5335 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing
5336− Nothing Nothing Nothing Nothing Nothing
5336+ Nothing Nothing Nothing Nothing []
5337
5337
5338data PhraseSuggesterHighlighter =
5338data PhraseSuggesterHighlighter =
5339 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text
5339 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text
@@ -5442,7 +5442,7 @@ instance FromJSON DirectGeneratorSuggestModeTypes where
5442 parse f = fail ("Unexpected DirectGeneratorSuggestModeTypes: " <> show f)
5442 parse f = fail ("Unexpected DirectGeneratorSuggestModeTypes: " <> show f)
5443
5443
5444data DirectGenerators = DirectGenerators
5444data DirectGenerators = DirectGenerators
5445− { directGeneratorsField :: Text
5445+ { directGeneratorsField :: FieldName
5446 , directGeneratorsSize :: Maybe Int
5446 , directGeneratorsSize :: Maybe Int
5447 , directGeneratorSuggestMode :: DirectGeneratorSuggestModeTypes
5447 , directGeneratorSuggestMode :: DirectGeneratorSuggestModeTypes
5448 , directGeneratorMaxEdits :: Maybe Double
5448 , directGeneratorMaxEdits :: Maybe Double
@@ -5485,3 +5485,6 @@ instance FromJSON DirectGenerators where
5485 <*> o .:? "max_term_freq"
5485 <*> o .:? "max_term_freq"
5486 <*> o .:? "pre_filter"
5486 <*> o .:? "pre_filter"
5487 <*> o .:? "post_filter"
5487 <*> o .:? "post_filter"
5488+
5489+mkDirectGenerators :: FieldName -> DirectGenerators
5490+mkDirectGenerators fn = DirectGenerators fn Nothing DirectGeneratorSuggestModeMissing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing