Commit fc269783 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/169-dev-uniqid-removal' into dev

parents c1152b62 5c6dbea2
...@@ -134,7 +134,6 @@ newtype Document = ...@@ -134,7 +134,6 @@ newtype Document =
, source :: Maybe String , source :: Maybe String
, institutes :: Maybe String , institutes :: Maybe String
, title :: Maybe String , title :: Maybe String
, uniqId :: Maybe String
--, url :: Maybe String --, url :: Maybe String
--, text :: Maybe String --, text :: Maybe String
} }
...@@ -176,7 +175,6 @@ defaultDocument = ...@@ -176,7 +175,6 @@ defaultDocument =
, source : Nothing , source : Nothing
, institutes : Nothing , institutes : Nothing
, title : Nothing , title : Nothing
, uniqId : Nothing
--, url : Nothing --, url : Nothing
--, text : Nothing --, text : Nothing
} }
...@@ -54,9 +54,8 @@ type Hyperdata_ ...@@ -54,9 +54,8 @@ type Hyperdata_
, hrd_source :: String , hrd_source :: String
, hrd_title :: String , hrd_title :: String
, hrd_url :: String , hrd_url :: String
, hrd_uniqId :: String )
, hrd_uniqIdBdd :: String )
type Hyperdata = Record Hyperdata_ type Hyperdata = Record Hyperdata_
type NodeContext_ type NodeContext_
...@@ -118,8 +117,7 @@ type ContextsForNgramsQuery ...@@ -118,8 +117,7 @@ type ContextsForNgramsQuery
, hrd_source :: Unit , hrd_source :: Unit
, hrd_title :: Unit , hrd_title :: Unit
, hrd_url :: Unit , hrd_url :: Unit
, hrd_uniqId :: Unit }
, hrd_uniqIdBdd :: Unit }
} }
} }
contextsForNgramsQuery :: ContextsForNgramsQuery contextsForNgramsQuery :: ContextsForNgramsQuery
......
...@@ -189,8 +189,6 @@ type HyperdataContactT = ...@@ -189,8 +189,6 @@ type HyperdataContactT =
, lastValidation :: Maybe String , lastValidation :: Maybe String
, source :: Maybe String , source :: Maybe String
, title :: Maybe String , title :: Maybe String
, uniqId :: Maybe String
, uniqIdBdd :: Maybe String
, who :: Maybe ContactWho , who :: Maybe ContactWho
) )
newtype HyperdataContact = newtype HyperdataContact =
...@@ -209,8 +207,6 @@ instance JSON.ReadForeign HyperdataContact where ...@@ -209,8 +207,6 @@ instance JSON.ReadForeign HyperdataContact where
, ou: fromMaybe [] inst.where , ou: fromMaybe [] inst.where
, source: inst.source , source: inst.source
, title: inst.title , title: inst.title
, uniqId: inst.uniqId
, uniqIdBdd: inst.uniqIdBdd
, who: inst.who } , who: inst.who }
instance JSON.WriteForeign HyperdataContact instance JSON.WriteForeign HyperdataContact
where where
...@@ -219,8 +215,6 @@ instance JSON.WriteForeign HyperdataContact ...@@ -219,8 +215,6 @@ instance JSON.WriteForeign HyperdataContact
, where: hc.ou , where: hc.ou
, source: hc.source , source: hc.source
, title: hc.title , title: hc.title
, uniqId: hc.uniqId
, uniqIdBdd: hc.uniqIdBdd
, who: hc.who } , who: hc.who }
defaultHyperdataContact :: HyperdataContact defaultHyperdataContact :: HyperdataContact
...@@ -231,8 +225,6 @@ defaultHyperdataContact = ...@@ -231,8 +225,6 @@ defaultHyperdataContact =
, title: Nothing , title: Nothing
, source: Nothing , source: Nothing
, lastValidation: Nothing , lastValidation: Nothing
, uniqId: Nothing
, uniqIdBdd: Nothing
} }
newtype HyperdataUser = newtype HyperdataUser =
......
...@@ -95,8 +95,6 @@ newtype HyperdataRowDocument = ...@@ -95,8 +95,6 @@ newtype HyperdataRowDocument =
, source :: Maybe String , source :: Maybe String
, title :: Maybe String , title :: Maybe String
, url :: Maybe String , url :: Maybe String
, uniqId :: Maybe String
, uniqIdBdd :: Maybe String
} }
derive instance Generic HyperdataRowDocument _ derive instance Generic HyperdataRowDocument _
...@@ -141,8 +139,6 @@ newtype HyperdataContact = ...@@ -141,8 +139,6 @@ newtype HyperdataContact =
, title :: Maybe String , title :: Maybe String
, source :: Maybe String , source :: Maybe String
, lastValidation :: Maybe String , lastValidation :: Maybe String
, uniqIdBdd :: Maybe String
, uniqId :: Maybe String
} }
derive instance Generic HyperdataContact _ derive instance Generic HyperdataContact _
instance Eq HyperdataContact where eq = genericEq instance Eq HyperdataContact where eq = genericEq
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment