ukamnya
/
microdata
forked from ukamnya/microdata_mirror
1
0
Fork 0
Code Pull Requests Activity

Added subitems

master
Ian Davis 2012-06-10 16:22:51 +01:00
parent a4244ac31d
commit cc14cf6b0c
2 changed files with 99 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
microdata.go
View File

@ -27,6 +27,11 @@ func (self *Item) SetString(property string, value string) {
self.properties[property] = append(self.properties[property], value) self.properties[property] = append(self.properties[property], value)
} }
func (self *Item) SetItem(property string, value *Item) {
self.properties[property] = append(self.properties[property], value)
}
type Microdata struct { type Microdata struct {
items []*Item items []*Item
} }
@ -111,6 +116,35 @@ func (self *Parser) Parse() (*Microdata, error) {
func (self *Parser) readItem(item *Item, node *h5.Node) { func (self *Parser) readItem(item *Item, node *h5.Node) {
if itemprop, exists := getAttr("itemprop", node); exists { if itemprop, exists := getAttr("itemprop", node); exists {
if _, exists := getAttr("itemscope", node); exists {
subitem := NewItem()
if itemrefs, exists := getAttr("itemref", node); exists {
for _, itemref := range strings.Split(strings.TrimSpace(itemrefs), " ") {
itemref = strings.TrimSpace(itemref)
if refnode, exists := self.identifiedNodes[itemref]; exists {
self.readItem(subitem, refnode)
}
}
}
if len(node.Children) > 0 {
for _, child := range node.Children {
self.readItem(subitem, child)
}
}
for _, propertyName := range strings.Split(strings.TrimSpace(itemprop), " ") {
propertyName = strings.TrimSpace(propertyName)
if propertyName != "" {
item.SetItem(propertyName, subitem)
}
}
return
} else {
var propertyValue string var propertyValue string
switch node.Data() { switch node.Data() {
@ -149,6 +183,11 @@ func (self *Parser) readItem(item *Item, node *h5.Node) {
item.SetString(propertyName, propertyValue) item.SetString(propertyName, propertyValue)
} }
} }
}
} }
if len(node.Children) > 0 { if len(node.Children) > 0 {
@ -156,6 +195,7 @@ func (self *Parser) readItem(item *Item, node *h5.Node) {
self.readItem(item, child) self.readItem(item, child)
} }
} }
} }
func getAttr(name string, node *h5.Node) (string, bool) { func getAttr(name string, node *h5.Node) (string, bool) {

30
microdata_test.go
View File

@ -465,7 +465,35 @@ func TestParseEmbeddedItem(t *testing.T) {
t.Errorf("Property value 'Amanda' not found for 'name'") t.Errorf("Property value 'Amanda' not found for 'name'")
} }
subitem := data.items[0].properties["band"][0].(Item) subitem := data.items[0].properties["band"][0].(*Item)
if subitem.properties["name"][0].(string) != "Jazz Band" {
t.Errorf("Property value 'Jazz Band' not found for 'name'")
}
}
func TestParseEmbeddedItemWithItemRef(t *testing.T) {
html := `<body>
<div itemscope id="amanda" itemref="a b"></div>
<p id="a">Name: <span itemprop="name">Amanda</span></p>
<div id="b" itemprop="band" itemscope itemref="c"></div>
<div id="c">
<p>Band: <span itemprop="name">Jazz Band</span></p>
<p>Size: <span itemprop="size">12</span> players</p>
</div></body>`
data := ParseData(html, t)
if len(data.items) != 1 {
t.Errorf("Expecting 1 item but got %d", len(data.items))
}
if data.items[0].properties["name"][0].(string) != "Amanda" {
t.Errorf("Property value 'Amanda' not found for 'name'")
}
subitem := data.items[0].properties["band"][0].(*Item)
if subitem.properties["name"][0].(string) != "Jazz Band" { if subitem.properties["name"][0].(string) != "Jazz Band" {
t.Errorf("Property value 'Jazz Band' not found for 'name'") t.Errorf("Property value 'Jazz Band' not found for 'name'")