git.iko.soy/typeable/bloodhound
on master help sign in
implemented simple queries
f6827a0Chris Allen
Database/Bloodhound/Types.hs+2
compare with master
unifiedsplit
@@ -138,6 +138,8 @@ module Database.Bloodhound.Types
138 , Locale(..)
138 , Locale(..)
139 , AnalyzeWildcard(..)
139 , AnalyzeWildcard(..)
140 , EnablePositionIncrements(..)
140 , EnablePositionIncrements(..)
141+ , SimpleQueryFlag(..)
142+ , FieldOrFields(..)
141 ) where
143 ) where
142
144
143import Data.Aeson
145import Data.Aeson
Database/Bloodhound/Types/Instances.hs+39
@@ -216,9 +216,48 @@ instance ToJSON Query where
216 toJSON (QueryRegexpQuery query) =
216 toJSON (QueryRegexpQuery query) =
217 object [ "regexp" .= toJSON query ]
217 object [ "regexp" .= toJSON query ]
218
218
219+ toJSON (QuerySimpleQueryStringQuery query) =
220+ object [ "simple_query_string" .= toJSON query ]
221+
222+
219mField :: (ToJSON a, Functor f) => T.Text -> f a -> f (T.Text, Value)
223mField :: (ToJSON a, Functor f) => T.Text -> f a -> f (T.Text, Value)
220mField field = fmap ((field .=) . toJSON)
224mField field = fmap ((field .=) . toJSON)
221
225
226+instance ToJSON SimpleQueryStringQuery where
227+ toJSON (SimpleQueryStringQuery sqsQueryString
228+ sqsFields sqsBoolean sqsAnalyzer
229+ sqsFlags sqsLowercaseExpanded sqsLocale) =
230+ object conjoined
231+ where base = [ "query" .= toJSON sqsQueryString ]
232+ maybeAdd =
233+ catMaybes [ mField "fields" sqsFields
234+ , mField "default_operator" sqsBoolean
235+ , mField "analyzer" sqsAnalyzer
236+ , mField "flags" sqsFlags
237+ , mField "lowercase_expanded_terms" sqsLowercaseExpanded
238+ , mField "locale" sqsLocale ]
239+ conjoined = base ++ maybeAdd
240+
241+instance ToJSON FieldOrFields where
242+ toJSON (FofField fieldName) =
243+ toJSON fieldName
244+ toJSON (FofFields fieldNames) =
245+ toJSON fieldNames
246+
247+instance ToJSON SimpleQueryFlag where
248+ toJSON SimpleQueryAll = "ALL"
249+ toJSON SimpleQueryNone = "NONE"
250+ toJSON SimpleQueryAnd = "AND"
251+ toJSON SimpleQueryOr = "OR"
252+ toJSON SimpleQueryPrefix = "PREFIX"
253+ toJSON SimpleQueryPhrase = "PHRASE"
254+ toJSON SimpleQueryPrecedence = "PRECEDENCE"
255+ toJSON SimpleQueryEscape = "ESCAPE"
256+ toJSON SimpleQueryWhitespace = "WHITESPACE"
257+ toJSON SimpleQueryFuzzy = "FUZZY"
258+ toJSON SimpleQueryNear = "NEAR"
259+ toJSON SimpleQuerySlop = "SLOP"
260+
222instance ToJSON RegexpQuery where
261instance ToJSON RegexpQuery where
223 toJSON (RegexpQuery (FieldName rqQueryField)
262 toJSON (RegexpQuery (FieldName rqQueryField)
224 (Regexp regexpQueryQuery) rqQueryFlags
263 (Regexp regexpQueryQuery) rqQueryFlags
Makefile+3
@@ -24,6 +24,9 @@ reset:
24haddock:
24haddock:
25 cabal haddock --hoogle --hyperlink-source --html-location='http://hackage.haskell.org/package/bloodhound/docs' --contents-location='http://hackage.haskell.org/package/bloodhound'
25 cabal haddock --hoogle --hyperlink-source --html-location='http://hackage.haskell.org/package/bloodhound/docs' --contents-location='http://hackage.haskell.org/package/bloodhound'
26
26
27+dist:
28+ cabal sdist
29+
27# cp -R ./dist/doc/html/bloodhound/ bloodhound-0.1.0.1-docs
30# cp -R ./dist/doc/html/bloodhound/ bloodhound-0.1.0.1-docs
28# tar cvzf --format=ustar -f bloodhound-0.1.0.1-docs.tar.gz bloodhound-0.1.0.1-docs
31# tar cvzf --format=ustar -f bloodhound-0.1.0.1-docs.tar.gz bloodhound-0.1.0.1-docs
29# curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary '@bloodhound-0.1.0.1-docs.tar.gz' 'https://bitemyapp:$PASSWORD@hackage.haskell.org/package/bloodhound-0.1.0.1/docs'
32# curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary '@bloodhound-0.1.0.1-docs.tar.gz' 'https://bitemyapp:$PASSWORD@hackage.haskell.org/package/bloodhound-0.1.0.1/docs'