Author: tchemit Date: 2014-06-04 17:12:13 +0200 (Wed, 04 Jun 2014) New Revision: 1181 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1181 Log: fix extract graphs Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/ExtractRawDataAndResultsCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/ExtractRawDataAndResultsCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/result/util/Reports.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java 2014-06-04 15:11:45 UTC (rev 1180) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/EchoBaseResultRepository.java 2014-06-04 15:12:13 UTC (rev 1181) @@ -151,8 +151,7 @@ @Override public boolean isDataResult() { - //FIXME - return false; + return true; } @Override Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/ExtractRawDataAndResultsCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/ExtractRawDataAndResultsCommand.java 2014-06-04 15:11:45 UTC (rev 1180) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/ExtractRawDataAndResultsCommand.java 2014-06-04 15:12:13 UTC (rev 1181) @@ -63,8 +63,7 @@ @Override public boolean accept(ExtractRawDataAndResultsRequest request) { - //TODO Remove false when will be ok... - boolean result = false && repository.matchExtractTypeList(request) && + boolean result = repository.matchExtractTypeList(request) && repository.matchZone(request); if (result && repository.isIndicatorsResult()) { @@ -232,23 +231,28 @@ LegacyPredicates.communityIndicatorPredicate(indicator), LegacyPredicates.communitySpeciesListPredicate(speciesList)); - // extract raw data - DataStorage storage = extractCommunity(predicate); - - String rawDataText = DataStorages.toString(storage); - // generate chart JFreeChart chart = generateCommunityChart(zone, indicator, speciesList); - // generate chart file - File chartFile = getCharts().generateChartFile("coser-community-chart-", - chart, - width, - height); + if (chart != null) { - result.put(zone, indicator, Pair.of(chartFile, rawDataText)); + // generate chart file + File chartFile = getCharts().generateChartFile("coser-community-chart-", + chart, + width, + height); + + // extract raw data + DataStorage storage = extractCommunity(predicate); + + String rawDataText = DataStorages.toString(storage); + + result.put(zone, indicator, Pair.of(chartFile, rawDataText)); + + } + } return result; } @@ -287,23 +291,28 @@ LegacyPredicates.populationIndicatorPredicate(indicator), LegacyPredicates.populationSpeciesPredicate(species)); - // extract raw data - DataStorage storage = extractPopulation(predicate); - - String rawDataText = DataStorages.toString(storage); - // generate chart JFreeChart chart = generatePopulationChart(zone, indicator, species); - // generate chart file - File chartFile = getCharts().generateChartFile("coser-population-chart-", - chart, - width, - height); + if (chart != null) { - result.put(zone, indicator + "-" + species, Pair.of(chartFile, rawDataText)); + // generate chart file + File chartFile = getCharts().generateChartFile("coser-population-chart-", + chart, + width, + height); + + // extract raw data + DataStorage storage = extractPopulation(predicate); + + String rawDataText = DataStorages.toString(storage); + + result.put(zone, indicator + "-" + species, Pair.of(chartFile, rawDataText)); + + } + } } return result; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/ExtractRawDataAndResultsCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/ExtractRawDataAndResultsCommand.java 2014-06-04 15:11:45 UTC (rev 1180) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/ExtractRawDataAndResultsCommand.java 2014-06-04 15:12:13 UTC (rev 1181) @@ -228,23 +228,27 @@ LegacyPredicates.communityIndicatorPredicate(indicator), LegacyPredicates.communitySpeciesListPredicate(speciesList)); - // extract raw data - DataStorage storage = extractCommunity(predicate); - - String rawDataText = DataStorages.toString(storage); - // generate chart JFreeChart chart = generateCommunityChart(zone, indicator, speciesList); - // generate chart file - File chartFile = getCharts().generateChartFile("coser-community-chart-", - chart, - width, - height); + if (chart != null) { + // generate chart file + File chartFile = getCharts().generateChartFile("coser-community-chart-", + chart, + width, + height); - result.put(zone, indicator, Pair.of(chartFile, rawDataText)); + // extract raw data + DataStorage storage = extractCommunity(predicate); + + String rawDataText = DataStorages.toString(storage); + + result.put(zone, indicator, Pair.of(chartFile, rawDataText)); + + } + } return result; } @@ -283,23 +287,28 @@ LegacyPredicates.populationIndicatorPredicate(indicator), LegacyPredicates.populationSpeciesPredicate(species)); - // extract raw data - DataStorage storage = extractPopulation(predicate); - - String rawDataText = DataStorages.toString(storage); - // generate chart JFreeChart chart = generatePopulationChart(zone, indicator, species); - // generate chart file - File chartFile = getCharts().generateChartFile("coser-population-chart-", - chart, - width, - height); + if (chart != null) { - result.put(zone, indicator + "-" + species, Pair.of(chartFile, rawDataText)); + // generate chart file + File chartFile = getCharts().generateChartFile("coser-population-chart-", + chart, + width, + height); + + // extract raw data + DataStorage storage = extractPopulation(predicate); + + String rawDataText = DataStorages.toString(storage); + + result.put(zone, indicator + "-" + species, Pair.of(chartFile, rawDataText)); + + } + } } return result; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/result/util/Reports.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/result/util/Reports.java 2014-06-04 15:11:45 UTC (rev 1180) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/result/util/Reports.java 2014-06-04 15:12:13 UTC (rev 1181) @@ -430,7 +430,9 @@ htmlContent.append("</body></html>"); // get content as w3c document - Document document = CoserUtils.parseDocument(htmlContent.toString()); + String content = htmlContent.toString(); + content = content.replaceAll("&","&"); + Document document = CoserUtils.parseDocument(content); // render template output as pdf // remove accents and strange characters from zone display name