Mercurial > gemma

comparison pkg/controllers/gauges.go @ 3725:18777f6df3ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Partially fix waterlevel selection for gauge_measurements(_predictions)
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 20 Jun 2019 18:42:52 +0200
parents ec6163c6687d
children 80bdcd137a1d 1562a5fb36dc
comparison
equal deleted inserted replaced
3724:05bbd1a97567 3725:18777f6df3ef
661 rw, fmt.Sprintf("error: Invalid ISRS code: %v", err), 661 rw, fmt.Sprintf("error: Invalid ISRS code: %v", err),
662 http.StatusBadRequest) 662 http.StatusBadRequest)
663 return 663 return
664 } 664 }
665 665
666 // TODO: FIXME The filter is not correct for predictions!?
666 filters := filterAnd{ 667 filters := filterAnd{
667 buildFilterTerm( 668 buildFilterTerm(
668 "location = ($%d::char(2), $%d::char(3), $%d::char(5), $%d::char(5), $%d::int)", 669 "location = ($%d::char(2), $%d::char(3), $%d::char(5), $%d::char(5), $%d::int)",
669 isrs.CountryCode, 670 isrs.CountryCode,
670 isrs.LoCode, 671 isrs.LoCode,
675 &filterOr{ 676 &filterOr{
676 &filterNot{&filterTerm{format: "predicted"}}, 677 &filterNot{&filterTerm{format: "predicted"}},
677 buildFilterTerm( 678 buildFilterTerm(
678 `date_issue = ( 679 `date_issue = (
679 SELECT max(date_issue) 680 SELECT max(date_issue)
680 FROM waterway.gauge_measurements gm 681 FROM waterway.gauge_predictions gm
681 WHERE location = ($%d::char(2), $%d::char(3), $%d::char(5), $%d::char(5), $%d::int))`, 682 WHERE location = ($%d::char(2), $%d::char(3), $%d::char(5), $%d::char(5), $%d::int))`,
682 isrs.CountryCode, 683 isrs.CountryCode,
683 isrs.LoCode, 684 isrs.LoCode,
684 isrs.FairwaySection, 685 isrs.FairwaySection,
685 isrs.Orc, 686 isrs.Orc,