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

Updates for both NIHVIVO-3039 and NIHVIVO-3038

Browse source
This commit is contained in:
hjkhjk54 2011-07-22 19:53:18 +00:00
parent 1713933e93
commit 4fa16f31ac
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java
View file

@ -118,6 +118,8 @@ public class DataGetterUtils {
//TODO: Check if can include by type here //TODO: Check if can include by type here
IndividualsForClassesDataGetter cidg = new IndividualsForClassesDataGetter(); IndividualsForClassesDataGetter cidg = new IndividualsForClassesDataGetter();
getPageDataGetterMap(context).put(cidg.getType(), cidg); getPageDataGetterMap(context).put(cidg.getType(), cidg);
InternalClassesDataGetter internalCdg = new InternalClassesDataGetter();
getPageDataGetterMap(context).put(internalCdg.getType(), internalCdg);
} }
} }
@ -215,11 +217,12 @@ public class DataGetterUtils {
new JSONObject().put("URI",vclass.getURI()) new JSONObject().put("URI",vclass.getURI())
.put("name",vclass.getName())); .put("name",vclass.getName()));
} else { } else {
//For now, utilize very first first VClass (assume that that is the one to be employed) //For now, utilize very last VClass (assume that that is the one to be employed)
//TODO: Find more general way of dealing with this //TODO: Find more general way of dealing with this
//put multiple ones in? //put multiple ones in?
if(vclassIds.size() > 0) { if(vclassIds.size() > 0) {
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(0)); int numberVClasses = vclassIds.size();
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1));
rObj.put("vclass", new JSONObject().put("URI",vclass.getURI()) rObj.put("vclass", new JSONObject().put("URI",vclass.getURI())
.put("name",vclass.getName())); .put("name",vclass.getName()));
} }