1
0
mirror of https://github.com/MontFerret/ferret.git synced 2025-11-25 22:01:39 +02:00

Minor tweaks

This commit is contained in:
Tim Voronov
2018-10-07 21:04:36 -04:00
parent 4898f1b9cb
commit 8f7edaedee
3 changed files with 20 additions and 380 deletions

View File

@@ -216,6 +216,7 @@ func (el *HTMLElement) Value() core.Value {
el.logger.Error().
Timestamp().
Err(err).
Int("id", int(el.id)).
Msg("failed to get node value")
return el.value
@@ -302,8 +303,9 @@ func (el *HTMLElement) QuerySelector(selector values.String) core.Value {
if err != nil {
el.logger.Error().
Timestamp().
Str("selector", selector.String()).
Err(err).
Int("id", int(el.id)).
Str("selector", selector.String()).
Msg("failed to retrieve a node by selector")
return values.None
@@ -314,8 +316,9 @@ func (el *HTMLElement) QuerySelector(selector values.String) core.Value {
if err != nil {
el.logger.Error().
Timestamp().
Str("selector", selector.String()).
Err(err).
Int("id", int(el.id)).
Str("selector", selector.String()).
Msg("failed to load a child node by selector")
return values.None
@@ -337,8 +340,9 @@ func (el *HTMLElement) QuerySelectorAll(selector values.String) core.Value {
if err != nil {
el.logger.Error().
Timestamp().
Str("selector", selector.String()).
Err(err).
Int("id", int(el.id)).
Str("selector", selector.String()).
Msg("failed to retrieve nodes by selector")
return values.None
@@ -352,10 +356,20 @@ func (el *HTMLElement) QuerySelectorAll(selector values.String) core.Value {
if err != nil {
el.logger.Error().
Timestamp().
Str("selector", selector.String()).
Err(err).
Int("id", int(el.id)).
Str("selector", selector.String()).
Msg("failed to load nodes by selector")
// close elements that are already loaded, but won't be used because of the error
if arr.Length() > 0 {
arr.ForEach(func(e core.Value, _ int) bool {
e.(*HTMLElement).Close()
return true
})
}
return values.None
}