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

NIHVIVO-1681 -- Made changes to EntityPubCountRequestHandler for graceful degradation of the vis incase the highest level org contains no pubs/grants.

Browse source
This commit is contained in:
bkoniden 2011-02-02 18:22:39 +00:00
parent 9b3ce6ecd5
commit b1f72c276f
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
View file

@ -102,15 +102,21 @@ public class EntityPublicationCountRequestHandler implements
Entity entity = queryManager.getQueryResult();
QueryRunner<Map<String, Set<String>>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner(
staffProvidedHighestLevelOrganization, dataSource, log);
Map<String, Set<String>> subOrganizationTypesResult = queryManagerForsubOrganisationTypes
.getQueryResult();
return prepareStandaloneResponse(vitroRequest, entity, staffProvidedHighestLevelOrganization,
subOrganizationTypesResult);
if(entity.getEntityLabel().equals("no-label")){
return prepareStandaloneErrorResponse(vitroRequest,staffProvidedHighestLevelOrganization);
} else {
QueryRunner<Map<String, Set<String>>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner(
staffProvidedHighestLevelOrganization, dataSource, log);
Map<String, Set<String>> subOrganizationTypesResult = queryManagerForsubOrganisationTypes
.getQueryResult();
return prepareStandaloneResponse(vitroRequest, entity, staffProvidedHighestLevelOrganization,
subOrganizationTypesResult);
}
}
}
@ -147,14 +153,21 @@ public class EntityPublicationCountRequestHandler implements
Entity entity = queryManager.getQueryResult();
QueryRunner<Map<String, Set<String>>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner(
highestLevelOrgURI, dataSource, log);
if(entity.getEntityLabel().equals("no-label")){
return prepareStandaloneErrorResponse(vitroRequest,highestLevelOrgURI);
} else {
Map<String, Set<String>> subOrganizationTypesResult = queryManagerForsubOrganisationTypes
.getQueryResult();
return prepareStandaloneResponse(vitroRequest, entity, highestLevelOrgURI,
subOrganizationTypesResult);
QueryRunner<Map<String, Set<String>>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner(
highestLevelOrgURI, dataSource, log);
Map<String, Set<String>> subOrganizationTypesResult = queryManagerForsubOrganisationTypes
.getQueryResult();
return prepareStandaloneResponse(vitroRequest, entity, highestLevelOrgURI,
subOrganizationTypesResult);
}
}
}