Compare commits

..

No commits in common. "e73b78ef3080edbab31c8c2a46c585684ab88e52" and "73624eadd8777db7053b94f19c921f58e7d7ae7a" have entirely different histories.

3 changed files with 4 additions and 27 deletions

View File

@ -1,7 +1,6 @@
package atom package atom
import ( import (
"encoding/xml"
"fmt" "fmt"
"mime" "mime"
"regexp" "regexp"
@ -87,9 +86,3 @@ func isValidLanguageTag(tag LanguageTag) bool {
func NewURN() IRI { func NewURN() IRI {
return IRI(fmt.Sprint("urn:uuid:", uuid.New())) return IRI(fmt.Sprint("urn:uuid:", uuid.New()))
} }
// isValidXML checks whether a string is valid XML. It returns a bool.
func isValidXML(input string) bool {
var v interface{}
return xml.Unmarshal([]byte(input), &v) == nil
}

View File

@ -16,12 +16,6 @@ type Category struct {
// NewCategory creates a new Category. It returns a *Category and an error. // NewCategory creates a new Category. It returns a *Category and an error.
func NewCategory(term, content string) (*Category, error) { func NewCategory(term, content string) (*Category, error) {
if content != "" {
if !isValidXML(content) {
return nil, fmt.Errorf("%v not valid XML", content)
}
}
return &Category{Term: term, Content: content}, nil return &Category{Term: term, Content: content}, nil
} }
@ -47,10 +41,8 @@ func (c *Category) Check() error {
return fmt.Errorf("label attribute %v of category not correctly escaped", c.Label) return fmt.Errorf("label attribute %v of category not correctly escaped", c.Label)
} }
if c.Content != "" { if c.Content == "" {
if !isValidXML(c.Content) { return errors.New("content element of category empty")
return fmt.Errorf("content element %v of category not valid XML", c.Content)
}
} }
return nil return nil

12
link.go
View File

@ -19,12 +19,6 @@ type Link struct {
// NewLink creates a new Link. It returns a *Link and an error. // NewLink creates a new Link. It returns a *Link and an error.
func NewLink(href, content string) (*Link, error) { func NewLink(href, content string) (*Link, error) {
if content != "" {
if !isValidXML(content) {
return nil, fmt.Errorf("%v not valid XML", content)
}
}
return &Link{Href: IRI(href), Content: content}, nil return &Link{Href: IRI(href), Content: content}, nil
} }
@ -57,10 +51,8 @@ func (l *Link) Check() error {
} }
} }
if l.Content != "" { if l.Content == "" {
if !isValidXML(l.Content) { return errors.New("content element of link empty")
return fmt.Errorf("content element %v of link not valid XML", l.Content)
}
} }
return nil return nil