From f539837b6d3fb23bbddce5d977ed17dcb407984a Mon Sep 17 00:00:00 2001 From: Tim Worrall Date: Thu, 19 Jun 2014 12:13:02 -0400 Subject: [PATCH 1/2] do not display primary positions on the manage people page --- .../freemarker/ManagePeopleForOrganizationController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java index 9c26b70f..c3861cd9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java @@ -72,8 +72,11 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet + " OPTIONAL { ?position core:relates ?person . " + " ?person a foaf:Person . \n" + " ?person rdfs:label ?label } \n" - + " OPTIONAL { ?position vitro:mostSpecificType ?subclass } \n" + + " OPTIONAL { ?position vitro:mostSpecificType ?subclass . \n" + + " OPTIONAL { ?subclass vitro:displayRankAnnot ?displayRank } \n" + + " } \n " + " OPTIONAL { ?position core:hideFromDisplay ?hideThis } \n " + + " FILTER ( ?displayRank < 500 )" + "} ORDER BY ?subclass ?name"; HashMap>> getPeople(String subjectUri, VitroRequest vreq) { From 4225807dfaefa545c7f4c0610acfd6505e79ab47 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 23 Jun 2014 14:37:37 -0400 Subject: [PATCH 2/2] VIVO-806 Remove deprecation warnings. --- .../cornell/mannlib/semservices/util/XMLUtils.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/edu/cornell/mannlib/semservices/util/XMLUtils.java b/src/edu/cornell/mannlib/semservices/util/XMLUtils.java index f4735ea4..faa2c913 100644 --- a/src/edu/cornell/mannlib/semservices/util/XMLUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/XMLUtils.java @@ -28,21 +28,16 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.xml.serialize.XMLSerializer; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import edu.cornell.mannlib.semservices.util.MetadataNamespaceContext; - /** * Convenience Class to parse XML strings to DOM Document for XML contents * retrieval. @@ -117,14 +112,16 @@ public class XMLUtils { * @param doc * @throws IOException */ + @SuppressWarnings("deprecation") public static void serializeDoc(Document doc) throws IOException { - XMLSerializer serializer = new XMLSerializer(); + org.apache.xml.serialize.XMLSerializer serializer = new org.apache.xml.serialize.XMLSerializer(); serializer.setOutputByteStream(System.out); serializer.serialize(doc); } + @SuppressWarnings("deprecation") public static String serializeDoctoString(Document doc) throws IOException { - XMLSerializer serializer = new XMLSerializer(); + org.apache.xml.serialize.XMLSerializer serializer = new org.apache.xml.serialize.XMLSerializer(); ByteArrayOutputStream bout = new ByteArrayOutputStream(); serializer.setOutputByteStream(bout);