From f7b9cfb4b29414a7aa64a021dabbd4470388742c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Tue, 17 Dec 2013 11:39:10 +0100 Subject: [PATCH] Harvester / Properly retrieve owner id from harvester config. --- .../kernel/harvest/harvester/AbstractParams.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java index 4f1a072bd05..cd74f52b131 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractParams.java @@ -87,9 +87,9 @@ public void create(Element node) throws BadInputEx { name = Util.getParam(site, "name", ""); uuid = Util.getParam(site, "uuid", UUID.randomUUID().toString()); - Element ownerIdE = site.getChild("ownerId"); + Element ownerIdE = node.getChild("owner"); if(ownerIdE != null) { - ownerId = ownerIdE.getText(); + ownerId = ownerIdE.getChildText("id"); } if(StringUtils.isEmpty(ownerId)){ @@ -139,11 +139,10 @@ public void update(Element node) throws BadInputEx { name = Util.getParam(site, "name", name); - Element ownerIdE = node.getChild("ownerId"); + Element ownerIdE = node.getChild("owner"); if(ownerIdE != null) { - ownerId = ownerIdE.getText(); - } - else { + ownerId = ownerIdE.getChildText("id"); + } else { Log.warning(Geonet.HARVEST_MAN, "No owner defined for harvester: " + name + " (" + uuid + ")"); }