Index: lams_central/src/java/org/lamsfoundation/lams/util/XMLReaders.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/util/Attic/XMLReaders.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_central/src/java/org/lamsfoundation/lams/util/XMLReaders.java 17 Aug 2009 04:39:17 -0000 1.1.2.1 +++ lams_central/src/java/org/lamsfoundation/lams/util/XMLReaders.java 2 Sep 2009 08:38:34 -0000 1.1.2.2 @@ -46,7 +46,7 @@ */ public class XMLReaders { - public static String getFireEagleBestGuess(String xml) throws SAXException, IOException, + public static String getFireEagleBestGuess(String xml, String attribute) throws SAXException, IOException, ParserConfigurationException { String location = ""; @@ -61,7 +61,7 @@ if (locationNode.getNodeType() == Node.ELEMENT_NODE) { Element locationElement = (Element) locationNode; if (StringUtils.equals(locationElement.getAttribute("best-guess"), "true")) { - NodeList nameList = locationElement.getElementsByTagName("name"); + NodeList nameList = locationElement.getElementsByTagName(attribute); Element nameElement = (Element) nameList.item(0); location = getTextValue(nameElement); } Index: lams_central/src/java/org/lamsfoundation/lams/web/OAuthAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/OAuthAction.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_central/src/java/org/lamsfoundation/lams/web/OAuthAction.java 17 Aug 2009 04:39:16 -0000 1.1.2.1 +++ lams_central/src/java/org/lamsfoundation/lams/web/OAuthAction.java 2 Sep 2009 08:38:33 -0000 1.1.2.2 @@ -187,7 +187,7 @@ try { String resource = oauthService.getOAuthResource(request, FireEagleOAuthPOJO.userLocResource, OAuthService.FIRE_EAGLE); - request.setAttribute("fe_resource", XMLReaders.getFireEagleBestGuess(resource)); + request.setAttribute("fe_resource", XMLReaders.getFireEagleBestGuess(resource, "name")); } catch (OAuthExpectationFailedException e) { e.printStackTrace(); request.setAttribute("fe_error", e.getMessage());