diff --git a/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/SotkaStatisticalDatasourcePlugin.java b/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/SotkaStatisticalDatasourcePlugin.java index decf45dc8..9b0e9b422 100755 --- a/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/SotkaStatisticalDatasourcePlugin.java +++ b/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/SotkaStatisticalDatasourcePlugin.java @@ -45,13 +45,15 @@ public void update() { JSONArray responseJSON = new JSONArray(data); SotkaIndicatorParser parser = new SotkaIndicatorParser(config); LOG.info("Parsing indicator response of length: " + responseJSON.length()); + int parsedIndicators = 0; for (int i = 0; i < responseJSON.length(); i++) { StatisticalIndicator indicator = parser.parse(responseJSON.getJSONObject(i), sotkaToLayerMappings); if(indicator != null) { + parsedIndicators++; onIndicatorProcessed(indicator); } } - LOG.info("Parsed indicator response."); + LOG.info("Updated datasource:", config.getUrl(), "with parsed", parsedIndicators, "of", responseJSON.length(), "indicators."); } catch (JSONException e) { LOG.error("Error in mapping Sotka Indicators response to Oskari model: " + e.getMessage(), e); } diff --git a/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/parser/SotkaIndicatorParser.java b/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/parser/SotkaIndicatorParser.java index e31425e73..6aaa958f0 100755 --- a/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/parser/SotkaIndicatorParser.java +++ b/service-statistics-sotka/src/main/java/fi/nls/oskari/control/statistics/plugins/sotka/parser/SotkaIndicatorParser.java @@ -77,7 +77,7 @@ StatisticalIndicator createIndicator(JSONObject json, Map sotkaLay ind.setSource(toLocalizationMap(json.getJSONObject("organization").getJSONObject("title"))); return setupMetadata(ind, sotkaLayersToOskariLayers); - } catch (JSONException e) { + } catch (Exception e) { LOG.error(e, "Could not read data from Sotka Indicator JSON."); return null; } @@ -340,6 +340,7 @@ private StatisticalIndicator setupMetadata(StatisticalIndicator ind, Map ignore the indicator by returning null + LOG.debug("Indicator:", ind.getId(), "doesn't have any of regionsets linked to datasource, ignoring"); return null; }