From e7336ab019115d01de526cc48ee7288f496c095d Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Tue, 31 May 2016 23:30:45 +0100 Subject: [PATCH 1/4] Fix error message (change erroneous UPDATE to SELECT) --- .../vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java index fa740230e..73fc5e168 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java @@ -304,7 +304,7 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { if (statusCode > 399) { log.error("response " + statusCode + " to query. \n"); log.debug("update string: \n" + queryStr); - throw new RDFServiceException("Unable to perform SPARQL UPDATE"); + throw new RDFServiceException("Unable to perform SPARQL SELECT"); } try (InputStream in = response.getEntity().getContent()) { From 6e520da662be88410dd6177ef641771f23f0d0ab Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Wed, 1 Jun 2016 15:29:57 +0100 Subject: [PATCH 2/4] [VIVO-1233] Wrap large buttons on ontology edit page --- .../edit/specific/ontologies_edit.jsp | 142 ++++++++++-------- 1 file changed, 77 insertions(+), 65 deletions(-) diff --git a/webapp/src/main/webapp/templates/edit/specific/ontologies_edit.jsp b/webapp/src/main/webapp/templates/edit/specific/ontologies_edit.jsp index 8fd9a53f8..e60d05d93 100644 --- a/webapp/src/main/webapp/templates/edit/specific/ontologies_edit.jsp +++ b/webapp/src/main/webapp/templates/edit/specific/ontologies_edit.jsp @@ -2,77 +2,89 @@ - - + + -
+
+ - + -
- - - - - + +
-
- -
-
- - -
-
- - -
-
- - -
- 		-
- - - -
- 		-
- - -
-
- - - - -
+
+ + + + + + + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ 		+
+ + + +
+ 		+
+ + +
+
+ + + + +
-
-
- - - - -
- RDF/XML abbreviated - RDF/XML - N3 - N-Triples - Turtle -
-
-
+
+ + + - -
+
+
+ + + + +
+ RDF/XML abbreviated + RDF/XML + N3 + N-Triples + Turtle +
+
+
-
-
- +
+
+
From 4df281bcd2ae02e544b26704d3fc51c62a3a2736 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 2 Jun 2016 14:06:16 +0100 Subject: [PATCH 3/4] [VIVO-1230] Make contact form compatible with SMTP relays --- .../freemarker/ContactMailController.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 2c3cdcbc4..f76d5e9c8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import javax.mail.Address; import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.SendFailedException; @@ -256,13 +257,13 @@ public class ContactMailController extends FreemarkerHttpServlet { MimeMessage msg = new MimeMessage( s ); //System.out.println("trying to send message from servlet"); - // Set the from address + // Set the reply address try { - msg.setFrom( new InternetAddress( webuseremail, webusername )); + msg.setReplyTo( new Address[] { new InternetAddress( webuseremail, webusername ) } ); } catch (UnsupportedEncodingException e) { - log.error("Can't set message sender with personal name " + webusername + + log.error("Can't set message reply with personal name " + webusername + " due to UnsupportedEncodingException"); - msg.setFrom( new InternetAddress( webuseremail ) ); +// msg.setFrom( new InternetAddress( webuseremail ) ); } // Set the recipient address @@ -272,6 +273,13 @@ public class ContactMailController extends FreemarkerHttpServlet { } msg.setRecipients( Message.RecipientType.TO, address ); + // Set the from address + if (address != null && address.length > 0) { + msg.setFrom(address[0]); + } else { + msg.setFrom( new InternetAddress( webuseremail ) ); + } + // Set the subject and text msg.setSubject( deliveryfrom ); From c87a66c949c14ae57d7d7a48f54f57fe20541dfa Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 3 Jun 2016 15:24:49 +0100 Subject: [PATCH 4/4] [VIVO-1224] Suppress default "synthetic" model from the lists on the ingest pages --- .../webapp/controller/jena/JenaIngestController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index f334f280a..56069871a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -188,8 +188,15 @@ public class JenaIngestController extends BaseEditController { request.setAttribute("bodyJsp",INGEST_MENU_JSP); } - maker = getModelMaker(vreq); - request.setAttribute("modelNames", maker.listModels().toList()); + maker = getModelMaker(vreq); + List modelNames = maker.listModels().toList(); + for (int mnIdx = modelNames.size() - 1; mnIdx > -1; mnIdx--) { + if (!modelNames.get(mnIdx).startsWith("http")) { + modelNames.remove(mnIdx); + } + } + + request.setAttribute("modelNames", modelNames); RequestDispatcher rd = request.getRequestDispatcher( Controllers.BASIC_JSP);