Merge pull request #11 from qmuntal/core-props

Add xsi:type attribute to core props dates

Author: qmuntal

package.go

@@ -197,25 +197,26 @@ func (c *contentTypes) findType(name string) (string, error) {
 }
 
 type corePropertiesXMLMarshal struct {
-	XMLName        xml.Name `xml:"coreProperties"`
-	XML            string   `xml:"xmlns,attr"`
-	XMLDCTERMS     string   `xml:"xmlns:dcterms,attr"`
-	XMLDC          string   `xml:"xmlns:dc,attr"`
-	Category       string   `xml:"category,omitempty"`
-	ContentStatus  string   `xml:"contentStatus,omitempty"`
-	Created        string   `xml:"dcterms:created,omitempty"`
-	Creator        string   `xml:"dc:creator,omitempty"`
-	Description    string   `xml:"dc:description,omitempty"`
-	Identifier     string   `xml:"dc:identifier,omitempty"`
-	Keywords       string   `xml:"keywords,omitempty"`
-	Language       string   `xml:"dc:language,omitempty"`
-	LastModifiedBy string   `xml:"lastModifiedBy,omitempty"`
-	LastPrinted    string   `xml:"lastPrinted,omitempty"`
-	Modified       string   `xml:"dcterms:modified,omitempty"`
-	Revision       string   `xml:"revision,omitempty"`
-	Subject        string   `xml:"dc:subject,omitempty"`
-	Title          string   `xml:"dc:title,omitempty"`
-	Version        string   `xml:"version,omitempty"`
+	XMLName        xml.Name    `xml:"coreProperties"`
+	XML            string      `xml:"xmlns,attr"`
+	XMLDCTERMS     string      `xml:"xmlns:dcterms,attr"`
+	XMLDC          string      `xml:"xmlns:dc,attr"`
+	XMLXSI         string      `xml:"xmlns:xsi,attr"`
+	Category       string      `xml:"category,omitempty"`
+	ContentStatus  string      `xml:"contentStatus,omitempty"`
+	Created        w3CDateTime `xml:"dcterms:created,omitempty"`
+	Creator        string      `xml:"dc:creator,omitempty"`
+	Description    string      `xml:"dc:description,omitempty"`
+	Identifier     string      `xml:"dc:identifier,omitempty"`
+	Keywords       string      `xml:"keywords,omitempty"`
+	Language       string      `xml:"dc:language,omitempty"`
+	LastModifiedBy string      `xml:"lastModifiedBy,omitempty"`
+	LastPrinted    w3CDateTime `xml:"lastPrinted,omitempty"`
+	Modified       w3CDateTime `xml:"dcterms:modified,omitempty"`
+	Revision       string      `xml:"revision,omitempty"`
+	Subject        string      `xml:"dc:subject,omitempty"`
+	Title          string      `xml:"dc:title,omitempty"`
+	Version        string      `xml:"version,omitempty"`
 }
 
 type corePropertiesXMLUnmarshal struct {
@@ -240,6 +241,16 @@ type corePropertiesXMLUnmarshal struct {
 	Version        string   `xml:"version,omitempty"`
 }
 
+type w3CDateTime string
+
+func (s w3CDateTime) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	type xmlType struct {
+		XSITYPE string `xml:"xsi:type,attr"`
+		Value   string `xml:",chardata"`
+	}
+	return e.EncodeElement(xmlType{"dcterms:W3CDTF", string(s)}, start)
+}
+
 // CoreProperties enable users to get and set well-known and common sets of property metadata within packages.
 type CoreProperties struct {
 	PartName       string // Won't be writed to the package, only used to indicate the location of the CoreProperties part. If empty the default location is "/props/core.xml".
@@ -269,10 +280,11 @@ func (c *CoreProperties) encode(w io.Writer) error {
 		"http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
 		"http://purl.org/dc/terms/",
 		"http://purl.org/dc/elements/1.1/",
-		c.Category, c.ContentStatus, c.Created,
+		"http://www.w3.org/2001/XMLSchema-instance",
+		c.Category, c.ContentStatus, w3CDateTime(c.Created),
 		c.Creator, c.Description, c.Identifier,
 		c.Keywords, c.Language, c.LastModifiedBy,
-		c.LastPrinted, c.Modified, c.Revision,
+		w3CDateTime(c.LastPrinted), w3CDateTime(c.Modified), c.Revision,
 		c.Subject, c.Title, c.Version,
 	})
 }

package_test.go

@@ -92,7 +92,8 @@ func TestPackage_add(t *testing.T) {
 func buildCoreString(content string) string {
 	s := `<?xml version="1.0" encoding="UTF-8"?>` + "\n"
 	s += `<coreProperties xmlns="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"`
-	s += ` xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dc="http://purl.org/dc/elements/1.1/">`
+	s += ` xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dc="http://purl.org/dc/elements/1.1/"`
+	s += ` xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">`
 	return s + content + "</coreProperties>"
 }
 
@@ -106,21 +107,21 @@ func TestCoreProperties_encode(t *testing.T) {
 		{"empty", &CoreProperties{}, buildCoreString(""), false},
 		{"some", &CoreProperties{Category: "A", LastPrinted: "b"}, buildCoreString(`
     <category>A</category>
-    <lastPrinted>b</lastPrinted>
+    <lastPrinted xsi:type="dcterms:W3CDTF">b</lastPrinted>
 `), false},
 		{"all", &CoreProperties{"partName", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"},
 			buildCoreString(`
     <category>a</category>
     <contentStatus>b</contentStatus>
-    <dcterms:created>c</dcterms:created>
+    <dcterms:created xsi:type="dcterms:W3CDTF">c</dcterms:created>
     <dc:creator>d</dc:creator>
     <dc:description>e</dc:description>
     <dc:identifier>f</dc:identifier>
     <keywords>g</keywords>
     <dc:language>h</dc:language>
     <lastModifiedBy>i</lastModifiedBy>
-    <lastPrinted>j</lastPrinted>
-    <dcterms:modified>k</dcterms:modified>
+    <lastPrinted xsi:type="dcterms:W3CDTF">j</lastPrinted>
+    <dcterms:modified xsi:type="dcterms:W3CDTF">k</dcterms:modified>
     <revision>l</revision>
     <dc:subject>m</dc:subject>
     <dc:title>n</dc:title>