diff --git a/Registry/Utils.hs b/Registry/Utils.hs index 8f0e622..dd98740 100644 --- a/Registry/Utils.hs +++ b/Registry/Utils.hs @@ -105,18 +105,22 @@ descrToString a = concat (List.intersperse " / " a) prefixesToString a = concat (List.intersperse " / " a) toString (Lang l) = (lang'subtag l) ++ "\t" ++ dateToString (lang'added l) ++ "\t" ++ descrToString (lang'descr l) ++ "\t" ++ - (maybeToString (lang'script l)) ++ "\t" ++ + (maybeToString (lang'script l)) ++ "\t" ++ + (maybeToString (lang'deprecated l)) ++ "\t" ++ (maybeToString (lang'comment l)) ++ "\n" toString (GF t) = (gf'tag t) ++ "\n" toString (Scr s) = (script'subtag s) ++ "\t" ++ dateToString (script'added s) ++ "\t" ++ descrToString (script'descr s) ++ "\t" ++ + (maybeToString (script'deprecated s)) ++ "\t" ++ (maybeToString (script'comment s)) ++ "\n" toString (Reg r) = (region'subtag r) ++ "\t" ++ dateToString (region'added r) ++ "\t" ++ descrToString (region'descr r) ++ "\t" ++ + (maybeToString (region'deprecated r)) ++ "\t" ++ (maybeToString (region'comment r)) ++ "\n" toString (Var v) = (variant'subtag v) ++ "\t" ++ dateToString (variant'added v) ++ "\t" ++ descrToString (variant'descr v) ++ "\t" ++ - prefixesToString (variant'prefix v) ++ "\t" ++ + prefixesToString (variant'prefix v) ++ "\t" ++ + (maybeToString (variant'deprecated v)) ++ "\t" ++ (maybeToString (variant'comment v)) ++ "\n" toString (Red r) = (redundant'tag r) ++ "\t" ++ dateToString (redundant'added r) ++ "\t" ++ descrToString (redundant'descr r) ++ "\n" @@ -161,18 +165,21 @@ toXML (GF t) = "" ++ (gf'tag t) ++ "" ++ addedToXML (gf'added t) ++ descrToXML (gf'descr t) ++ "\n" toXML (Scr s) = "\n" toXML (Reg r) = "" ++ (region'subtag r) ++ "" ++ + deprecatedToXML (region'deprecated r) ++ commentToXML (region'comment r) ++ addedToXML (region'added r) ++ descrToXML (region'descr r) ++ "\n" toXML (Var v) = "" ++ (variant'subtag v) ++ "" ++ + deprecatedToXML (variant'deprecated v) ++ commentToXML (variant'comment v) ++ addedToXML (variant'added v) ++ - descrToXML (variant'descr v) ++ - prefixesToXML (variant'prefix v) ++ "\n" + descrToXML (variant'descr v) ++ + prefixesToXML (variant'prefix v) ++ "\n" toXML (Red r) = "" ++ (redundant'tag r) ++ "" ++ addedToXML (redundant'added r) ++ descrToXML (redundant'descr r) ++ "\n"