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

Merge r5941 from nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-09-27 14:07:42 +00:00
parent bbde9a3eb5
commit db26e25758
1 changed files with 57 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityMergedPropertyListController.java
View file

@ -575,17 +575,17 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
return true; return true;
} }
// Person's positions // Person's positions
if (propertyUri.equals(vivoCoreOntology + "personInPosition")) { if (propertyUri.equals(vivoCoreOntology + "personInPosition")) {
sortReverseChron(statements, vivoCoreOntology + "endYear", vivoCoreOntology + "startYear"); sortReverseChron(statements, vivoCoreOntology + "endYear", vivoCoreOntology + "startYear");
return true; return true;
} }
// // Person's publications // Person's publications
// if (propertyUri.equals(vivoCoreOntology + "authorInAuthorship")) { if (propertyUri.equals(vivoCoreOntology + "authorInAuthorship")) {
// sortByReverseChronAndRelatedIndividualName(statements, vivoCoreOntology + " ", vivoCoreOntology + " "); sortByReverseChronAndRelatedIndividualName(statements, vivoCoreOntology + "year", vivoCoreOntology + "linkedInformationResource");
// return true; return true;
// } }
return false; return false;
} }
@ -604,9 +604,9 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
} }
private void sortReverseChron(List<ObjectPropertyStatement> statements, String endYearPredicate, String startYearPredicate) { private void sortReverseChron(List<ObjectPropertyStatement> statements, String endYearPredicate, String startYearPredicate) {
// 1. Sort by end date descending, null dates first // 1. Sort by end year descending, nulls first
// 2. Then by start date descending, null dates last // 2. Then by start year descending, nulls last
// 3. No sorting for entries with no start or end date - just put at the bottom in random order // 3. No sorting for entries with no start or end year - just put at the bottom in random order
final String endYearProperty = endYearPredicate; final String endYearProperty = endYearPredicate;
final String startYearProperty = startYearPredicate; final String startYearProperty = startYearPredicate;
Collections.sort(statements, new Comparator<ObjectPropertyStatement>() { Collections.sort(statements, new Comparator<ObjectPropertyStatement>() {
@ -623,7 +623,7 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
String startRightValue = right.getObject().getDataValue(startYearProperty); String startRightValue = right.getObject().getDataValue(startYearProperty);
Integer startRight = startRightValue == null ? null : Integer.valueOf(startRightValue); Integer startRight = startRightValue == null ? null : Integer.valueOf(startRightValue);
// No sorting for entries with no start or end date - just put at the bottom in random order // No sorting for entries with no start or end year - just put at the bottom in random order
if (endLeft == null && startLeft == null) { if (endLeft == null && startLeft == null) {
return 1; return 1;
} }
@ -631,9 +631,9 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
return -1; return -1;
} }
// First sort by end date // First sort by end year
// A null end date precedes // A null end year precedes
// But if both end dates are null, compare start dates // But if both end years are null, compare start years
if ( ! (endLeft == null && endRight == null) ) { if ( ! (endLeft == null && endRight == null) ) {
if (endLeft == null) { if (endLeft == null) {
return -1; return -1;
@ -648,8 +648,8 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
} }
} }
// If end dates are equal, sort by start date // If end years are equal, sort by start year
// A null start date follows // A null start year follows
if (startLeft == null) { if (startLeft == null) {
return 1; return 1;
} }
@ -662,21 +662,49 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
}); });
} }
// private void sortByReverseChronAndRelatedIndividualName(List<ObjectPropertyStatement> statements, private void sortByReverseChronAndRelatedIndividualName(List<ObjectPropertyStatement> statements,
// String datePredicate, String relatedIndividualPredicate) { String yearPredicate, String relatedIndividualPredicate) {
// // 1. Sort by year descending, nulls at end
// } // 2. If years are the same, sort by related individual (in the case of authorships, publication) name
final String yearProperty = yearPredicate;
final String relatedIndividualProperty = relatedIndividualPredicate;
Collections.sort(statements, new Comparator<ObjectPropertyStatement>() {
public int compare(ObjectPropertyStatement left, ObjectPropertyStatement right) {
Individual indLeft = left.getObject().getRelatedIndividual(relatedIndividualProperty);
Individual indRight = right.getObject().getRelatedIndividual(relatedIndividualProperty);
String leftYearValue = indLeft.getDataValue(yearProperty);
Integer leftYear = leftYearValue == null ? null : Integer.valueOf(leftYearValue);
String rightYearValue = indRight.getDataValue(yearProperty);
Integer rightYear = rightYearValue == null ? null : Integer.valueOf(rightYearValue);
// First sort by year, nulls at end
// But if both null, sort by publication name
if ( ! (leftYear == null && rightYear == null) ) {
if (leftYear == null) {
return 1;
}
if (rightYear == null) {
return -1;
}
int yearComp = leftYear.compareTo(rightYear);
if (yearComp != 0) {
return 0 - yearComp;
}
}
// If years are equal, sort by publication name
return indLeft.getName().compareTo(indRight.getName());
}
});
}
// Sort statements by the name of the individual on the other side of the context node. // Sort statements by the name of the individual on the other side of the context node.
private void sortByRelatedIndividualNames(List<ObjectPropertyStatement> statements, String predicateUri) { private void sortByRelatedIndividualNames(List<ObjectPropertyStatement> statements, String predicateUri) {
log.debug("In sortByRelatedIndividualNames(), before sorting");
if (log.isDebugEnabled()) {
for (ObjectPropertyStatement ops : statements) {
log.debug(ops.getObject().getRelatedIndividual(predicateUri).getName());
}
}
final String propertyUri = predicateUri; final String propertyUri = predicateUri;
Collections.sort(statements, new Comparator<ObjectPropertyStatement>() { Collections.sort(statements, new Comparator<ObjectPropertyStatement>() {
public int compare(ObjectPropertyStatement left, ObjectPropertyStatement right) { public int compare(ObjectPropertyStatement left, ObjectPropertyStatement right) {
@ -685,13 +713,6 @@ public class EntityMergedPropertyListController extends VitroHttpServlet {
return indLeft.getName().compareTo(indRight.getName()); return indLeft.getName().compareTo(indRight.getName());
} }
}); });
log.debug("In sortByRelatedIndividualNames(), after sorting");
if (log.isDebugEnabled()) {
for (ObjectPropertyStatement ops : statements) {
log.debug(ops.getObject().getRelatedIndividual(predicateUri).getName());
}
}
} }
private List<Individual> getObjectsFromStmts(List<ObjectPropertyStatement> orgStmtList) { private List<Individual> getObjectsFromStmts(List<ObjectPropertyStatement> orgStmtList) {