Commit cb4385d8bceccbac5fe80754bb76b16f939aef2e
-
- Patrick Stählin <pstaehlin @futu…lab.ch>
- Diff rendering mode:
- inline
- side by side
core/web/handler/meteringrequesthandler.cpp
(2 / 2)
| 142 | 142 | log("Trying to load series from " + seriesPath); | |
| 143 | 143 | SeriesReader<CurrentValue> reader; | |
| 144 | 144 | boost::shared_ptr<Series<CurrentValue> > s = boost::shared_ptr<Series<CurrentValue> >(reader.readFromXML(seriesPath)); | |
| 145 | if(s == NULL) { | ||
| 145 | if(s != NULL) { | ||
| 146 | 146 | boost::shared_ptr<std::deque<CurrentValue> > values = s->getExpandedValues(); | |
| 147 | 147 | ||
| 148 | 148 | boost::shared_ptr<JSONObject> resultObj(new JSONObject()); | |
| … | … | ||
| 163 | 163 | ||
| 164 | 164 | return success(resultObj); | |
| 165 | 165 | } else { | |
| 166 | return failure("No data-file for '" + typeString + "' and resolution '" + resolutionString + "'"); | ||
| 166 | return failure("Could not parse/read data-file for '" + typeString + "' and resolution '" + resolutionString + "'"); | ||
| 167 | 167 | } | |
| 168 | 168 | } | |
| 169 | 169 | } else { |
