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

update SPARQL Query Builder rule validation.

Browse source
This commit is contained in:
yuysun 2010-11-17 00:26:35 +00:00
parent e0cc7a634b
commit 2e137e316b
5 changed files with 11 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
View file

@ -56,31 +56,10 @@ public class GetAllClasses extends BaseEditController {
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
return;
VitroRequest vreq = new VitroRequest(request);
Object obj = vreq.getSession().getAttribute("loginHandler");
LoginFormBean loginHandler = null;
if (obj != null && obj instanceof LoginFormBean)
loginHandler = ((LoginFormBean) obj);
if (loginHandler == null
|| !"authenticated".equalsIgnoreCase(loginHandler
.getLoginStatus()) ||
// rjy7 Allows any editor (including self-editors) access to
// this servlet.
// This servlet is now requested via Ajax from some custom
// forms, so anyone
// using the custom form needs access rights.
Integer.parseInt(loginHandler.getLoginRole()) < LoginFormBean.NON_EDITOR) {
HttpSession session = request.getSession(true);
session.setAttribute("postLoginRequest", vreq.getRequestURI()
+ (vreq.getQueryString() != null ? ('?' + vreq
.getQueryString()) : ""));
String redirectURL = request.getContextPath()
+ Controllers.SITE_ADMIN + "?login=block";
response.sendRedirect(redirectURL);
return;
}
// EditProcessObject epo = super.createEpo(request);

25
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
View file

@ -60,31 +60,10 @@ public class GetAllPrefix extends BaseEditController {
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
return;
VitroRequest vreq = new VitroRequest(request);
Object obj = vreq.getSession().getAttribute("loginHandler");
LoginFormBean loginHandler = null;
if (obj != null && obj instanceof LoginFormBean)
loginHandler = ((LoginFormBean) obj);
if (loginHandler == null
|| !"authenticated".equalsIgnoreCase(loginHandler
.getLoginStatus()) ||
// rjy7 Allows any editor (including self-editors) access to
// this servlet.
// This servlet is now requested via Ajax from some custom
// forms, so anyone
// using the custom form needs access rights.
Integer.parseInt(loginHandler.getLoginRole()) < LoginFormBean.NON_EDITOR) {
HttpSession session = request.getSession(true);
session.setAttribute("postLoginRequest", vreq.getRequestURI()
+ (vreq.getQueryString() != null ? ('?' + vreq
.getQueryString()) : ""));
String redirectURL = request.getContextPath()
+ Controllers.SITE_ADMIN + "?login=block";
response.sendRedirect(redirectURL);
return;
}
// EditProcessObject epo = super.createEpo(request);
OntologyDao daoObj = vreq.getFullWebappDaoFactory().getOntologyDao();

25
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
View file

@ -54,32 +54,11 @@ public class GetClazzDataProperties extends BaseEditController {
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
return;
VitroRequest vreq = new VitroRequest(request);
Object obj = vreq.getSession().getAttribute("loginHandler");
LoginFormBean loginHandler = null;
if (obj != null && obj instanceof LoginFormBean)
loginHandler = ((LoginFormBean) obj);
if (loginHandler == null
|| !"authenticated".equalsIgnoreCase(loginHandler
.getLoginStatus()) ||
// rjy7 Allows any editor (including self-editors) access to
// this servlet.
// This servlet is now requested via Ajax from some custom
// forms, so anyone
// using the custom form needs access rights.
Integer.parseInt(loginHandler.getLoginRole()) < LoginFormBean.NON_EDITOR) {
HttpSession session = request.getSession(true);
session.setAttribute("postLoginRequest", vreq.getRequestURI()
+ (vreq.getQueryString() != null ? ('?' + vreq
.getQueryString()) : ""));
String redirectURL = request.getContextPath()
+ Controllers.SITE_ADMIN + "?login=block";
response.sendRedirect(redirectURL);
return;
}
String vClassURI = vreq.getParameter("vClassURI");
if (vClassURI == null || vClassURI.trim().equals("")) {

26
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
View file

@ -49,32 +49,10 @@ public class GetClazzObjectProperties extends BaseEditController {
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
return;
VitroRequest vreq = new VitroRequest(request);
Object obj = vreq.getSession().getAttribute("loginHandler");
LoginFormBean loginHandler = null;
if (obj != null && obj instanceof LoginFormBean)
loginHandler = ((LoginFormBean) obj);
if (loginHandler == null
|| !"authenticated".equalsIgnoreCase(loginHandler
.getLoginStatus()) ||
// rjy7 Allows any editor (including self-editors) access to
// this servlet.
// This servlet is now requested via Ajax from some custom
// forms, so anyone
// using the custom form needs access rights.
Integer.parseInt(loginHandler.getLoginRole()) < LoginFormBean.NON_EDITOR) {
HttpSession session = request.getSession(true);
session.setAttribute("postLoginRequest", vreq.getRequestURI()
+ (vreq.getQueryString() != null ? ('?' + vreq
.getQueryString()) : ""));
String redirectURL = request.getContextPath()
+ Controllers.SITE_ADMIN + "?login=block";
response.sendRedirect(redirectURL);
return;
}
String vClassURI = vreq.getParameter("vClassURI");
if (vClassURI == null || vClassURI.trim().equals("")) {

25
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
View file

@ -58,31 +58,10 @@ public class GetObjectClasses extends BaseEditController {
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
return;
VitroRequest vreq = new VitroRequest(request);
Object obj = vreq.getSession().getAttribute("loginHandler");
LoginFormBean loginHandler = null;
if (obj != null && obj instanceof LoginFormBean)
loginHandler = ((LoginFormBean) obj);
if (loginHandler == null
|| !"authenticated".equalsIgnoreCase(loginHandler
.getLoginStatus()) ||
// rjy7 Allows any editor (including self-editors) access to
// this servlet.
// This servlet is now requested via Ajax from some custom
// forms, so anyone
// using the custom form needs access rights.
Integer.parseInt(loginHandler.getLoginRole()) < LoginFormBean.NON_EDITOR) {
HttpSession session = request.getSession(true);
session.setAttribute("postLoginRequest", vreq.getRequestURI()
+ (vreq.getQueryString() != null ? ('?' + vreq
.getQueryString()) : ""));
String redirectURL = request.getContextPath()
+ Controllers.SITE_ADMIN + "?login=block";
response.sendRedirect(redirectURL);
return;
}
String predicate = vreq.getParameter("predicate");
if (predicate == null || predicate.trim().equals("")) {