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

Refactoring names of startdates in QueryFieldLabels.java

Browse source
This commit is contained in:
bkoniden 2011-01-31 19:35:58 +00:00
parent 98231b0ce3
commit fb263e3178
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryFieldLabels.java
View file

@ -115,10 +115,16 @@ public class QueryFieldLabels {
public static final String CO_PI_LABEL = "coPILabelLit"; public static final String CO_PI_LABEL = "coPILabelLit";
public static final String GRANT_URL = "grantLit"; public static final String GRANT_URL = "grantLit";
public static final String GRANT_LABEL = "grantLabelLit"; public static final String GRANT_LABEL = "grantLabelLit";
public static final String GRANT_START_DATE = "grantStartDateLit";
public static final String GRANT_END_DATE = "grantEndDateLit"; /*
public static final String GRANT_START_DATE_FOR_GRANT = "grantStartDateForGrantLit"; * Role Start/End Date is chosen as the default Start Date for all the queries,
public static final String GRANT_END_DATE_FOR_GRANT = "grantEndDateForGrantLit"; * in whose absence Grant Start/End Date is chosen.
*/
public static final String ROLE_START_DATE = "grantStartDateLit";
public static final String ROLE_END_DATE = "grantEndDateLit";
public static final String GRANT_START_DATE = "grantStartDateForGrantLit";
public static final String GRANT_END_DATE = "grantEndDateForGrantLit";
} }

8
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountQueryRunner.java
View file

@ -646,21 +646,21 @@ public class CoPIGrantCountQueryRunner implements QueryRunner<CoPIData> {
} }
RDFNode grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE); RDFNode grantStartYear = solution.get(QueryFieldLabels.ROLE_START_DATE);
if (grantStartYear != null) { if (grantStartYear != null) {
grant.setGrantStartDate(grantStartYear.toString()); grant.setGrantStartDate(grantStartYear.toString());
}else{ }else{
grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT); grantStartYear = solution.get(QueryFieldLabels.GRANT_START_DATE);
if(grantStartYear != null){ if(grantStartYear != null){
grant.setGrantStartDate(grantStartYear.toString()); grant.setGrantStartDate(grantStartYear.toString());
} }
} }
RDFNode grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE); RDFNode grantEndDate = solution.get(QueryFieldLabels.ROLE_END_DATE);
if (grantEndDate != null) { if (grantEndDate != null) {
grant.setGrantEndDate(grantEndDate.toString()); grant.setGrantEndDate(grantEndDate.toString());
}else{ }else{
grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT); grantEndDate = solution.get(QueryFieldLabels.GRANT_END_DATE);
if(grantEndDate != null){ if(grantEndDate != null){
grant.setGrantEndDate(grantEndDate.toString()); grant.setGrantEndDate(grantEndDate.toString());
} }

8
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountQueryRunner.java
View file

@ -138,21 +138,21 @@ public class EntityGrantCountQueryRunner implements QueryRunner<Entity> {
grant.setGrantLabel(grantLabelNode.toString()); grant.setGrantLabel(grantLabelNode.toString());
} }
RDFNode grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE); RDFNode grantStartDateNode = solution.get(QueryFieldLabels.ROLE_START_DATE);
if(grantStartDateNode != null){ if(grantStartDateNode != null){
grant.setGrantStartDate(grantStartDateNode.toString()); grant.setGrantStartDate(grantStartDateNode.toString());
}else { }else {
grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT); grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
if(grantStartDateNode != null){ if(grantStartDateNode != null){
grant.setGrantStartDate(grantStartDateNode.toString()); grant.setGrantStartDate(grantStartDateNode.toString());
} }
} }
RDFNode grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE); RDFNode grantEndDateNode = solution.get(QueryFieldLabels.ROLE_END_DATE);
if(grantEndDateNode != null){ if(grantEndDateNode != null){
grant.setGrantEndDate(grantEndDateNode.toString()); grant.setGrantEndDate(grantEndDateNode.toString());
}else { }else {
grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT); grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
if(grantEndDateNode != null){ if(grantEndDateNode != null){
grant.setGrantEndDate(grantEndDateNode.toString()); grant.setGrantEndDate(grantEndDateNode.toString());
} }

8
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountQueryRunner.java
View file

@ -103,21 +103,21 @@ public class PersonGrantCountQueryRunner implements QueryRunner<Set<Grant>>{
grant.setIndividualLabel(grantLabelNode.toString()); grant.setIndividualLabel(grantLabelNode.toString());
} }
RDFNode grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE); RDFNode grantStartDateNode = solution.get(QueryFieldLabels.ROLE_START_DATE);
if(grantStartDateNode != null){ if(grantStartDateNode != null){
grant.setGrantStartDate(grantStartDateNode.toString()); grant.setGrantStartDate(grantStartDateNode.toString());
}else { }else {
grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE_FOR_GRANT); grantStartDateNode = solution.get(QueryFieldLabels.GRANT_START_DATE);
if(grantStartDateNode != null){ if(grantStartDateNode != null){
grant.setGrantStartDate(grantStartDateNode.toString()); grant.setGrantStartDate(grantStartDateNode.toString());
} }
} }
RDFNode grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE); RDFNode grantEndDateNode = solution.get(QueryFieldLabels.ROLE_END_DATE);
if(grantEndDateNode != null){ if(grantEndDateNode != null){
grant.setGrantEndDate(grantEndDateNode.toString()); grant.setGrantEndDate(grantEndDateNode.toString());
}else { }else {
grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE_FOR_GRANT); grantEndDateNode = solution.get(QueryFieldLabels.GRANT_END_DATE);
if(grantEndDateNode != null){ if(grantEndDateNode != null){
grant.setGrantEndDate(grantEndDateNode.toString()); grant.setGrantEndDate(grantEndDateNode.toString());
} }