X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FNews.hs;h=78dc935ca6d3ab1e3e4947cc6a5ae0e23fbf97bb;hb=84cf25190eeb5c2059cf6b9aea47e0f2bb073188;hp=4a59859cacb770f55fb8472638f02051edbe9dd3;hpb=bd75961380ef07c2ba0ab5412e4326a197fd40c5;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index 4a59859..78dc935 100644 --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -58,72 +58,14 @@ import TSN.Codegen ( import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) import TSN.Picklers ( xp_time_stamp ) import TSN.XmlImport ( XmlImport(..) ) -import Xml ( FromXml(..), pickle_unpickle, unpickleable ) +import Xml ( FromXml(..), ToDb(..), pickle_unpickle, unpickleable ) - --- | The database type for teams as they show up in the news. --- -data NewsTeam = - NewsTeam { team_name :: String } - deriving (Eq, Show) - --- | This is needed to define the XmlImport instance for NewsTeam; it --- basically says that the DB representation is the same as the XML --- representation. --- -instance FromXml NewsTeam where - type Db NewsTeam = NewsTeam - from_xml = id - --- | Allow us to call 'insert_xml' on the XML representation of --- NewsTeams. --- -instance XmlImport NewsTeam - - --- | Mapping between News records and NewsTeam records in the --- database. We don't name the fields because we don't use the names --- explicitly; that means we have to give them nice database names --- via groundhog. --- -data News_NewsTeam = News_NewsTeam - (DefaultKey News) - (DefaultKey NewsTeam) - - --- | The database type for locations as they show up in the news. --- -data NewsLocation = - NewsLocation { - city :: Maybe String, - state :: Maybe String, - country :: String } - deriving (Eq, Show) - --- | This is needed to define the XmlImport instance for NewsLocation; it --- basically says that the DB representation is the same as the XML --- representation. -- -instance FromXml NewsLocation where - type Db NewsLocation = NewsLocation - from_xml = id - --- | Allow us to call 'insert_xml' on the XML representation of --- NewsLocations. --- -instance XmlImport NewsLocation - - --- | Mapping between News records and NewsLocation records in the --- database. We don't name the fields because we don't use the names --- explicitly; that means we have to give them nice database names --- via groundhog. +-- DB/XML Data types -- -data News_NewsLocation = News_NewsLocation - (DefaultKey News) - (DefaultKey NewsLocation) +-- * News/Message -- | The msg_id child of contains an event_id attribute; we -- embed it into the 'News' type. We (pointlessly) use the "db_" @@ -162,6 +104,7 @@ data Message = -- data News = News { + db_xml_file_id :: Int, db_mid :: MsgId, db_sport :: String, db_url :: Maybe String, @@ -173,16 +116,19 @@ data News = deriving (Data, Eq, Show, Typeable) + +instance ToDb Message where + type Db Message = News + -- | Convert the XML representation 'Message' to the database -- representation 'News'. -- instance FromXml Message where - type Db Message = News - -- | We use a record wildcard so GHC doesn't complain that we never -- used the field names. -- - from_xml Message{..} = News { db_mid = xml_mid, + from_xml Message{..} = News { db_xml_file_id = xml_xml_file_id, + db_mid = xml_mid, db_sport = xml_sport, db_url = xml_url, db_sms = xml_sms, @@ -195,6 +141,89 @@ instance FromXml Message where -- instance XmlImport Message + +-- * NewsTeam + +-- | The database type for teams as they show up in the news. +-- +data NewsTeam = + NewsTeam { team_name :: String } + deriving (Eq, Show) + + +instance ToDb NewsTeam where + -- | The database representaion of a 'NewsTeam' is itself. + type Db NewsTeam = NewsTeam + +-- | This is needed to define the XmlImport instance for NewsTeam. +-- +instance FromXml NewsTeam where + -- | How to we get a 'NewsTeam' from itself? + from_xml = id + +-- | Allow us to call 'insert_xml' on the XML representation of +-- NewsTeams. +-- +instance XmlImport NewsTeam + + + +-- * News_NewsTeam + +-- | Mapping between News records and NewsTeam records in the +-- database. We don't name the fields because we don't use the names +-- explicitly; that means we have to give them nice database names +-- via groundhog. +-- +data News_NewsTeam = News_NewsTeam + (DefaultKey News) + (DefaultKey NewsTeam) + + +-- * NewsLocation + +-- | The database type for locations as they show up in the news. +-- +data NewsLocation = + NewsLocation { + city :: Maybe String, + state :: Maybe String, + country :: String } + deriving (Eq, Show) + +instance ToDb NewsLocation where + -- | The database representation of a 'NewsLocation' is itself. + type Db NewsLocation = NewsLocation + +-- | This is needed to define the XmlImport instance for NewsLocation. +-- +instance FromXml NewsLocation where + -- | How to we get a 'NewsLocation' from itself? + from_xml = id + +-- | Allow us to call 'insert_xml' on the XML representation of +-- NewsLocations. +-- +instance XmlImport NewsLocation + + +-- * News_NewsLocation + +-- | Mapping between News records and NewsLocation records in the +-- database. We don't name the fields because we don't use the names +-- explicitly; that means we have to give them nice database names +-- via groundhog. +-- +data News_NewsLocation = News_NewsLocation + (DefaultKey News) + (DefaultKey NewsLocation) + + + +-- +-- Database code +-- + -- | Define 'dbmigrate' and 'dbimport' for 'Message's. The import is -- slightly non-generic because of our 'News_NewsTeam' and -- 'News_NewsLocation' join tables. @@ -263,11 +292,17 @@ mkPersist tsn_codegen_config [groundhog| dbName: news constructors: - name: News + uniques: + - name: unique_news + type: constraint + # Prevent multiple imports of the same message. + fields: [db_xml_file_id] fields: - name: db_mid embeddedType: - {name: msg_id, dbName: msg_id} - {name: event_id, dbName: event_id} + - embedded: MsgId fields: - name: db_msg_id @@ -275,7 +310,6 @@ mkPersist tsn_codegen_config [groundhog| - name: db_event_id dbName: event_id - - entity: News_NewsTeam dbName: news__news_teams constructors: @@ -305,6 +339,9 @@ mkPersist tsn_codegen_config [groundhog| onDelete: cascade |] +-- +-- XML Picklers +-- -- | Convert a 'NewsTeam' to/from XML. -- @@ -432,7 +469,14 @@ test_news_fields_have_correct_names = map (\x -> tsn_db_field_namer "herp" "derp" 8675309 x 90210) field_names actual :: [String] - actual = ["mid", "sport", "url", "sms", "editor", "text", "continue"] + actual = ["xml_file_id", + "mid", + "sport", + "url", + "sms", + "editor", + "text", + "continue"] check (x,y) = (x @?= y)