|
@@ -33,7 +33,7 @@ import (
|
|
)
|
|
)
|
|
|
|
|
|
func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string,
|
|
func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string,
|
|
- GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) (ret *av.Table, err error) {
|
|
|
|
|
|
+ GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) (ret *av.Table) {
|
|
if nil == GetBlockAttrsWithoutWaitWriting {
|
|
if nil == GetBlockAttrsWithoutWaitWriting {
|
|
GetBlockAttrsWithoutWaitWriting = func(id string) (ret map[string]string) {
|
|
GetBlockAttrsWithoutWaitWriting = func(id string) (ret map[string]string) {
|
|
ret = cache.GetBlockIAL(id)
|
|
ret = cache.GetBlockIAL(id)
|
|
@@ -59,8 +59,8 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
|
|
for _, col := range view.Table.Columns {
|
|
for _, col := range view.Table.Columns {
|
|
key, getErr := attrView.GetKey(col.ID)
|
|
key, getErr := attrView.GetKey(col.ID)
|
|
if nil != getErr {
|
|
if nil != getErr {
|
|
- err = getErr
|
|
|
|
- return
|
|
|
|
|
|
+ logging.LogWarnf("get key [%s] failed: %s", col.ID, getErr)
|
|
|
|
+ continue
|
|
}
|
|
}
|
|
|
|
|
|
ret.Columns = append(ret.Columns, &av.TableColumn{
|
|
ret.Columns = append(ret.Columns, &av.TableColumn{
|
|
@@ -587,12 +587,7 @@ func getAttributeViewContent(avID string,
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- table, err := RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
|
|
|
|
- if nil != err {
|
|
|
|
- content = strings.TrimSpace(buf.String())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ table := RenderAttributeViewTable(attrView, view, "", GetBlockAttrsWithoutWaitWriting)
|
|
for _, col := range table.Columns {
|
|
for _, col := range table.Columns {
|
|
buf.WriteString(col.Name)
|
|
buf.WriteString(col.Name)
|
|
buf.WriteByte(' ')
|
|
buf.WriteByte(' ')
|