Merge branch 'dev' into dev-ilike-search-fix

bin/gargantext-hs.gource

@@ -6,10 +6,10 @@ DATE="2018-03-08 07:18:18"
 # use tutoriel code
 
 #tmux -d video
-xterm -e "tutoriel"
+#xterm -e "tutoriel"
 
 gource --start-date $DATE ../gargantext-hs &
-gource --start-date $DATE gargantext-hs/purescript-gargantext
+gource --start-date $DATE ../gargantext-hs/purescript-gargantext
 #tmux -a video
 
 # Share video ?

bin/install

 #!/bin/bash
 
-stack install --profile --test --fast # --haddock
+stack install --nix --profile --test --fast # --haddock

devops/nginx/default

 
 ##
-## GargantText serveur configuration
-## Authors: team@gargantext.org
-## Licence CNRS/AGPLv3-MIT/CECILL-INRIA
-#
-# Fee free to improve it
-# Thanks for sharing to all community
-
-
-# Specific NGINX informations
-#
 # You should look at the following URL's in order to grasp a solid understanding
 # of Nginx configuration files in order to fully unleash the power of Nginx.
 # http://wiki.nginx.org/Pitfalls
@@ -43,8 +33,8 @@ server {
 # Comment this for maintenance only
 server {
         
-    #server_name v4.gargantext.org;
-    server_name maintenanceOnly.gargantext.org;
+    server_name v4.gargantext.org;
+    #server_name maintenanceOnly.gargantext.org;
 
     add_header Cache-Control "no-cache";
 

package.yaml

 name: gargantext
-version: '0.0.3.7'
+version: '0.0.3.9'
 synopsis: Search, map, share
 description: Please see README.md
 category: Data

src/Gargantext/Database/Admin/Trigger/Nodes.hs

@@ -24,6 +24,7 @@ import Gargantext.Database.Prelude (Cmd, execPGSQuery)
 import Gargantext.Prelude
 import qualified Database.PostgreSQL.Simple as DPS
 
+
 triggerSearchUpdate :: HasDBid NodeType => Cmd err Int64
 triggerSearchUpdate = execPGSQuery query ( toDBid NodeDocument
                                          , toDBid NodeDocument

src/Gargantext/Database/Query/Facet.hs

@@ -73,9 +73,6 @@ import Gargantext.Database.Prelude
 import Gargantext.Database.Schema.Node
 import Gargantext.Prelude (printDebug)
 
---import qualified Opaleye.Internal.Column as C
---import qualified Opaleye.Internal.HaskellDB.PrimQuery as HPQ
-
 ------------------------------------------------------------------------
 -- | DocFacet
 
@@ -321,7 +318,6 @@ runViewDocuments cId t o l order query = do
     printDebug "[runViewDocuments] sqlQuery" $ showSql sqlQuery
     runOpaQuery $ filterWith o l order sqlQuery
   where
-    ntId :: Int
     ntId = toDBid NodeDocument
     sqlQuery = viewDocuments cId t ntId query
 --    viewDocuments' :: DPS.Query