Fix station filter logic for nodes having no children. #232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CallumNZ
requested changes
Feb 21, 2023
cmd/fdsn-ws/fdsn_station.go
Outdated
Comment on lines
629
to
632
| nNet := len(r.Network) | ||
| r.Network = ns | ||
|
|
||
| if len(ns) == 0 { | ||
| // No result ( no "Network" node ) | ||
| if nNet != 0 && len(ns) == 0 { | ||
| // this means the query has network parameter but idn't match one, we want to give a no data | ||
| return false | ||
| } |
There was a problem hiding this comment.
nNet is strange.
Can ns be networks ? or better yet filteredNetworks.
Would a defer r.Network = ns help, just after for loop? Also for station/channel sections.
Comment missing a d in didn't
There was a problem hiding this comment.
There's still trimLevel need to operate on the result slice. So can't move the assignment to defer.
CallumNZ
previously approved these changes
Feb 21, 2023
junghao
force-pushed
the
fix-filter
branch
2 times, most recently
from
d754a0b to
0cc80d8
Compare
|
@CallumNZ I found that the logic was incorrect. Could you please review my new update? Thanks |
CallumNZ
reviewed
Mar 7, 2023
| for _, p := range matchedParams { | ||
| if p.StationReg == nil && p.ChannelReg == nil && p.LocationReg == nil { | ||
| return true | ||
| if p.StationReg != nil && !contains(p.StationReg, REGEX_ANYTHING) { |
There was a problem hiding this comment.
What does the regex check add?
There was a problem hiding this comment.
See Jerome's comment regarding issue with WTSZ here https://github.com/GeoNet/tickets/issues/12671#issuecomment-1452655370
Short answer is : "*" includes "0 results".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As requested in https://github.com/GeoNet/tickets/issues/12671.
Also, text output will be in sync with XML output GeoNet/help#103.
Previously we deliberately make it not exists, so the fix is remove those extras.