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

changing type of vclassgroup objects passed to template NIHVIVO-1674

Browse source
This commit is contained in:
bdc34 2011-01-14 23:23:19 +00:00
parent fcbcd67fb4
commit f8eae4cd46
2 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
View file

@ -28,9 +28,9 @@ public class HomePageController extends FreemarkerHttpServlet {
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache( getServletContext() ); // VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache( getServletContext() );
List<VClassGroup> vClassGroups = vcgc.getGroups(vreq.getPortalId()); // List<VClassGroup> vClassGroups = vcgc.getGroups(vreq.getPortalId());
body.put("vClassGroups", vClassGroups); // body.put("vClassGroups", vClassGroups);
PageDataGetter dataGetter = PageDataGetter dataGetter =
PageController.getPageDataGetterMap(getServletContext()) PageController.getPageDataGetterMap(getServletContext())

41
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
View file

@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -63,7 +64,7 @@ public class BrowseDataGetter implements PageDataGetter {
private Map<String, Object> doClassAlphaDisplay( Map params, VitroRequest request, ServletContext context) throws Exception { private Map<String, Object> doClassAlphaDisplay( Map params, VitroRequest request, ServletContext context) throws Exception {
Map<String,Object> body = new HashMap<String,Object>(); Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(context)); body.putAll(getCommonValues(context, request));
body.putAll(getClassAlphaValues(params,request,context)); body.putAll(getClassAlphaValues(params,request,context));
return body; return body;
} }
@ -86,15 +87,23 @@ public class BrowseDataGetter implements PageDataGetter {
return map; return map;
} }
private Map<String,Object> getCommonValues( ServletContext context){ private Map<String,Object> getCommonValues( ServletContext context, VitroRequest vreq){
//doesn't do anything yet Map<String,Object> values = new HashMap<String,Object>();
Map<String,Object> values = new HashMap<String,Object>();
VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
List<VClassGroup> cgList = vcgc.getGroups(vreq.getPortalId());
LinkedList<VClassGroupTemplateModel> cgtmList = new LinkedList<VClassGroupTemplateModel>();
for( VClassGroup classGroup : cgList){
cgtmList.add( new VClassGroupTemplateModel( classGroup ));
}
values.put("vClassGroups",cgtmList);
return values; return values;
} }
protected Map<String, Object> doAllClassGroupsDisplay( Map params, Map<String, Object> page, VitroRequest request, ServletContext context) { protected Map<String, Object> doAllClassGroupsDisplay( Map params, Map<String, Object> page, VitroRequest request, ServletContext context) {
Map<String,Object> body = new HashMap<String,Object>(); Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(context)); body.putAll(getCommonValues(context,request));
body.putAll(getAllClassGroupData(request, params, page, context)); body.putAll(getAllClassGroupData(request, params, page, context));
return body; return body;
@ -105,23 +114,7 @@ public class BrowseDataGetter implements PageDataGetter {
* @param params2 * @param params2
*/ */
protected Map<String,Object> getAllClassGroupData(VitroRequest request, Map params, Map<String, Object> page, ServletContext context){ protected Map<String,Object> getAllClassGroupData(VitroRequest request, Map params, Map<String, Object> page, ServletContext context){
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
if( !page.containsKey("vClassGroups")){
VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache( context );
List<VClassGroup> vClassGroups = vcgc.getGroups(request.getPortalId());
map.put("vClassGroups", vClassGroups);
}
// VitroRequest vreq = new VitroRequest(request);
//
// VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
// List<VClassGroup> cgList = vcgc.getGroups(vreq.getPortalId());
//
// LinkedList<VClassGroupTemplateModel> cgtmList = new LinkedList<VClassGroupTemplateModel>();
// for( VClassGroup classGroup : cgList){
// cgtmList.add( new VClassGroupTemplateModel( classGroup ));
// }
// map.put("vclassGroupList",cgtmList);
return map; return map;
} }
@ -129,7 +122,7 @@ public class BrowseDataGetter implements PageDataGetter {
VitroRequest request, ServletContext context) { VitroRequest request, ServletContext context) {
Map<String,Object> body = new HashMap<String,Object>(); Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(context)); body.putAll(getCommonValues(context,request));
body.putAll(getClassData(request,params,context)); body.putAll(getClassData(request,params,context));
return body; return body;
@ -159,7 +152,7 @@ public class BrowseDataGetter implements PageDataGetter {
protected Map<String, Object> doClassGroupDisplay(Map params, VitroRequest request, ServletContext context) { protected Map<String, Object> doClassGroupDisplay(Map params, VitroRequest request, ServletContext context) {
Map<String,Object> body = new HashMap<String,Object>(); Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(context)); body.putAll(getCommonValues(context,request));
body.putAll( getClassGroupData(request,params, context)); body.putAll( getClassGroupData(request,params, context));
return body; return body;