added DataFields to content request

This commit is contained in:
Jan Halfar 2018-11-28 11:56:11 +01:00
parent 3479cd7eaf
commit 8f7c23ff4a
3 changed files with 12 additions and 7 deletions

View File

@ -76,9 +76,13 @@ func (node *RepoNode) ToItem(dataFields []string) *Item {
item.Name = node.Name
item.MimeType = node.MimeType
item.URI = node.URI
for _, dataField := range dataFields {
if data, ok := node.Data[dataField]; ok {
item.Data[dataField] = data
if dataFields == nil {
item.Data = node.Data
} else {
for _, dataField := range dataFields {
if data, ok := node.Data[dataField]; ok {
item.Data[dataField] = data
}
}
}
return item

View File

@ -140,7 +140,7 @@ func (repo *Repo) GetContent(r *requests.Content) (c *content.SiteContent, err e
c.MimeType = node.MimeType
c.Dimension = resolvedDimension
c.URI = resolvedURI
c.Item = node.ToItem([]string{})
c.Item = node.ToItem(r.DataFields)
c.Path = node.GetPath()
// fetch URIs for all dimensions
uris := make(map[string]string)

View File

@ -34,9 +34,10 @@ type Nodes struct {
// Content - the standard request to contentserver
type Content struct {
Env *Env `json:"env"`
URI string `json:"URI"`
Nodes map[string]*Node `json:"nodes"`
Env *Env `json:"env"`
URI string `json:"URI"`
Nodes map[string]*Node `json:"nodes"`
DataFields []string `json:"dataFields"`
}
// Update - request an update