[FIX] undefined lacking functions

src/Gargantext/Core/Text/Terms.hs

@@ -58,7 +58,7 @@ import Gargantext.Core.Text.Terms.Multi (multiterms)
 import Gargantext.Core.Types
 import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Query.Table.Ngrams (insertNgrams)
-import Gargantext.Database.Query.Table.NgramsPostag (NgramsPostag(..), insertNgramsPostag)
+import Gargantext.Database.Query.Table.NgramsPostag (NgramsPostag(..), insertNgramsPostag, np_form, np_lem)
 import Gargantext.Database.Schema.Ngrams (Ngrams(..), NgramsType(..), ngramsTerms, text2ngrams, NgramsId)
 import Gargantext.Prelude
 import qualified Gargantext.Data.HashMap.Strict.Utils as HashMap
@@ -126,15 +126,20 @@ class ExtractNgramsT h
                    -> h
                    -> Cmd err (HashMap ExtractedNgrams (Map NgramsType Int))
 ------------------------------------------------------------------------
+
+cleanNgrams :: Int -> Ngrams -> Ngrams
+cleanNgrams s ng 
+      | Text.length (ng ^. ngramsTerms) < s = ng
+      | otherwise                           = text2ngrams (Text.take s (ng ^. ngramsTerms))
+
 cleanExtractedNgrams :: Int -> ExtractedNgrams -> ExtractedNgrams
-cleanExtractedNgrams s (SimpleNgrams ng) 
-      | Text.length (ng ^. ngramsTerms) < s = SimpleNgrams ng
-      | otherwise                           = SimpleNgrams $ text2ngrams (Text.take s (ng ^. ngramsTerms))
-cleanExtractedNgrams s _ = undefined
+cleanExtractedNgrams s (SimpleNgrams   ng) = SimpleNgrams $ (cleanNgrams s) ng
+cleanExtractedNgrams s (EnrichedNgrams ng) = EnrichedNgrams $ over np_form (cleanNgrams s)
+                                                            $ over np_lem  (cleanNgrams s) ng
 
 extracted2ngrams :: ExtractedNgrams -> Ngrams
-extracted2ngrams (SimpleNgrams ng) = ng
-extracted2ngrams _ = undefined
+extracted2ngrams (SimpleNgrams   ng) = ng
+extracted2ngrams (EnrichedNgrams ng) = view np_form ng
 
 
 isSimpleNgrams :: ExtractedNgrams -> Bool

src/Gargantext/Core/Types.hs

@@ -61,9 +61,6 @@ data Terms = Terms { _terms_label :: Label
                    , _terms_stem  :: Stems
                    } deriving (Ord)
 
-instance Show Terms where
-  show (Terms l _) = show l
-
 instance Eq Terms where
   (==) (Terms _ s1) (Terms _ s2) = s1 == s2
 

src/Gargantext/Database/Query/Table/NgramsPostag.hs

@@ -16,6 +16,7 @@ Portability : POSIX
 module Gargantext.Database.Query.Table.NgramsPostag
     where
 
+import Control.Lens (makeLenses)
 import Data.HashMap.Strict (HashMap)
 import Data.Hashable (Hashable)
 import Data.Text (Text)
@@ -39,6 +40,8 @@ data NgramsPostag = NgramsPostag { _np_lang   :: Lang
                                  }
   deriving (Eq, Ord, Generic)
 
+makeLenses ''NgramsPostag
+
 instance Hashable NgramsPostag
 
 type NgramsPostagInsert = ( Int