litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing test comments output

Browse source
This commit is contained in:
hjk54 2010-02-12 16:58:47 +00:00
parent e60bd55d78
commit 79f0c67ce8
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java
View file

@ -148,6 +148,7 @@ public class EntityController extends VitroHttpServlet {
// insert test for whether a css files of the same name exists, and populate the customCss string for use when construction the header // insert test for whether a css files of the same name exists, and populate the customCss string for use when construction the header
} }
String netid = iwDao.getNetId(entity.getURI()); String netid = iwDao.getNetId(entity.getURI());
vreq.setAttribute("netid", netid); vreq.setAttribute("netid", netid);
vreq.setAttribute("vclassName", vclassName); vreq.setAttribute("vclassName", vclassName);
vreq.setAttribute("entity",entity); vreq.setAttribute("entity",entity);
@ -202,7 +203,7 @@ public class EntityController extends VitroHttpServlet {
vreq.setAttribute("scripts", "/templates/entity/entity_inject_head.jsp"); vreq.setAttribute("scripts", "/templates/entity/entity_inject_head.jsp");
RequestDispatcher rd = vreq.getRequestDispatcher( view ); RequestDispatcher rd = vreq.getRequestDispatcher( view );
rd.forward(req,res); rd.forward(vreq,res);
} catch (Throwable e) { } catch (Throwable e) {
log.error(e); log.error(e);
req.setAttribute("javax.servlet.jsp.jspException",e); req.setAttribute("javax.servlet.jsp.jspException",e);

3
webapp/src/edu/cornell/mannlib/vitro/webapp/web/EntityWebUtils.java
View file

@ -67,13 +67,16 @@ public class EntityWebUtils {
// see if we can get the URI from a namespace prefix and a local name // see if we can get the URI from a namespace prefix and a local name
String requestURI = vreq.getRequestURI(); String requestURI = vreq.getRequestURI();
String[] requestParts = requestURI.split("/individual/"); String[] requestParts = requestURI.split("/individual/");
String[] URIParts = requestParts[1].split("/"); String[] URIParts = requestParts[1].split("/");
String namespace = ""; String namespace = "";
NamespaceMapper namespaceMapper = NamespaceMapperFactory.getNamespaceMapper(vreq.getSession().getServletContext()); NamespaceMapper namespaceMapper = NamespaceMapperFactory.getNamespaceMapper(vreq.getSession().getServletContext());
String t; String t;
namespace = ( (t = namespaceMapper.getNamespaceForPrefix(URIParts[0])) != null) ? t : ""; namespace = ( (t = namespaceMapper.getNamespaceForPrefix(URIParts[0])) != null) ? t : "";
String localName = URIParts[1]; String localName = URIParts[1];
return vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(namespace+localName); return vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(namespace+localName);
// entityIdStr = vreq.getParameter("adw"); // entityIdStr = vreq.getParameter("adw");