X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FTSN%2FXML%2FNews.hs;h=661279272e5f1056221fdcb1e06cbfc1ccfe5157;hb=a1edb885c755aac52e805255382dda50f6664b60;hp=ad106d380a4122534920563a8b7b214a2eb555b1;hpb=a163a47ab0aed0072f7868d4b2b28aa4c326e5e1;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index ad106d3..6612792 100644 --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -30,6 +30,7 @@ import Database.Groundhog.Core ( DefaultKey ) import Database.Groundhog.TH ( groundhog, mkPersist ) +import System.Console.CmdArgs.Default ( Default(..) ) import Test.Tasty ( TestTree, testGroup ) import Test.Tasty.HUnit ( (@?=), testCase ) import Text.XML.HXT.Core ( @@ -171,23 +172,23 @@ instance ToFromXml Message where -- used our named fields. to_xml (Message {..}) = MessageXml - 0 - "" + def + def db_mid - "" + def db_sport db_url - [] - [] + def + def db_sms db_text db_continue - "" + def -- We don't need the key argument (from_xml_fk) since the XML type -- contains more information in this case. - from_xml (MessageXml _ _ c _ e f _ _ g h i _) = - Message c e f g h i + from_xml (MessageXml _ _ c _ e f _ _ i j k _) = + Message c e f i j k mkPersist tsn_codegen_config [groundhog|