[FIX] DocId

app/Main.hs

@@ -18,10 +18,7 @@ import qualified Data.Text as T
 
 yearReq = [text|
 (language_t:en)
-AND (producedDateY_i:2015
-     OR producedDateY_i:2016
-     OR producedDateY_i:2017
-     OR producedDateY_i:2018
+AND (producedDateY_i:2018
      OR producedDateY_i:2019
      OR producedDateY_i:2020
      OR producedDateY_i:2021
@@ -71,3 +68,4 @@ main = do
   case res of
     (Left  err) -> print err
     (Right val) -> print $ _docs val
+

src/HAL/Doc/Corpus.hs

@@ -14,7 +14,7 @@ import Servant.API (ToHttpApiData(..))
 
 data Corpus = Corpus
   {
-    _corpus_docid :: Int,
+    _corpus_docid :: Text,
     _corpus_title :: [Text],
     _corpus_abstract :: [Text],
     _corpus_date :: Maybe Text,
@@ -26,7 +26,7 @@ data Corpus = Corpus
 L.makeLenses ''Corpus
 
 instance Default Corpus where
-  def = Corpus def def def def def def def def
+  def = Corpus "" def def def def def def def
 
 instance FromJSON Corpus where
   parseJSON (Object o) = Corpus <$>

src/HAL/Doc/EntityTree.hs

@@ -11,19 +11,19 @@ import Servant.API (ToHttpApiData(..))
 
 data EntityTree = EntityTree
   {
-    _docid :: Int,
+    _docid :: Text,
     _label_s :: Maybe Text,
     _parentEntityTreeid_i :: [Text]
   } deriving (Generic)
 
 instance Default EntityTree where
-  def = EntityTree def def def
+  def = EntityTree "" def def
 
 instance FromJSON EntityTree where
-  parseJSON (Object o) = EntityTree <$>
-    (o .: "docid")
-    <*> (o .:? "label_s")
-    <*> (o .:? "parentEntityTreeid_i" .!= [])
+  parseJSON (Object o) =
+    EntityTree <$> (o .: "docid")
+               <*> (o .:? "label_s")
+               <*> (o .:? "parentEntityTreeid_i" .!= [])
 
 instance ToHttpApiData EntityTree where
   toUrlPiece _ = "docid,label_s,parentEntityTreeid_i"