Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadCalculate.java @ 6756:9cc0b03656fb
issue1433: Update caller for last commit.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 06 Aug 2013 12:26:21 +0200 |
| parents | b9dd591b3fbd |
| children | a56fe3bc6700 |
comparison
equal
deleted
inserted
replaced
| 6755:91c43293e538 | 6756:9cc0b03656fb |
|---|---|
| 138 if (results == null || results.length == 0) { | 138 if (results == null || results.length == 0) { |
| 139 logger.warn("Calculation computed no results!"); | 139 logger.warn("Calculation computed no results!"); |
| 140 return res; | 140 return res; |
| 141 } | 141 } |
| 142 | 142 |
| 143 String river = access.getRiver(); | |
| 144 SedimentLoad[] unknown = | |
| 145 SedimentLoadFactory.getSedimentLoadUnknown(river, access.getUnit().replace("_per_","/")); | |
| 146 | |
| 147 String type = access.getYearEpoch(); | 143 String type = access.getYearEpoch(); |
| 148 if (type.equals("year")) { | 144 if (type.equals("year")) { |
| 149 generateYearFacets(context, newFacets, results, getID(), hash); | 145 generateYearFacets(context, newFacets, results, getID(), hash); |
| 150 } | 146 } |
| 151 else if (type.equals("epoch")) { | 147 else if (type.equals("epoch")) { |
| 153 } | 149 } |
| 154 else if (type.equals("off_epoch")) { | 150 else if (type.equals("off_epoch")) { |
| 155 generateOffEpochFacets(context, newFacets, results, getID(), hash); | 151 generateOffEpochFacets(context, newFacets, results, getID(), hash); |
| 156 } | 152 } |
| 157 logger.debug("Created " + newFacets.size() + " new Facets."); | 153 logger.debug("Created " + newFacets.size() + " new Facets."); |
| 154 | |
| 155 String river = access.getRiver(); | |
| 156 SedimentLoad[] unknown = | |
| 157 SedimentLoadFactory.getSedimentLoadUnknown(river, | |
| 158 access.getUnit().replace("_per_","/"), type); | |
| 159 | |
| 158 if (res.getReport().hasProblems()) { | 160 if (res.getReport().hasProblems()) { |
| 159 newFacets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); | 161 newFacets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); |
| 160 } | 162 } |
| 161 | 163 |
| 162 for (int i = 0; i < unknown.length; i++) { | 164 for (int i = 0; i < unknown.length; i++) { |