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

NIHVIVO-746 Handle unranked authorships in add authors to publication form.

Browse source
This commit is contained in:
rjy7 2010-07-05 16:58:43 +00:00
parent d3737502c9
commit 36f0714549
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
View file

@ -15,26 +15,33 @@ public class DataPropertyComparator implements Comparator<Individual> {
} }
public int compare(Individual ind1, Individual ind2) { public int compare(Individual ind1, Individual ind2) {
DataPropertyStatement s1 = ind1.getDataPropertyStatement(dataPropertyUri); DataPropertyStatement dps1 = ind1.getDataPropertyStatement(dataPropertyUri);
DataPropertyStatement s2 = ind2.getDataPropertyStatement(dataPropertyUri); DataPropertyStatement dps2 = ind2.getDataPropertyStatement(dataPropertyUri);
String datatype = s1.getDatatypeURI();
int result; int result;
// This pushes null values to the end of the list
if (dps1 == null) {
result = (dps2 == null) ? 0 : 1;
} else if (dps2 == null) {
result = -1;
} else {
String datatype = dps1.getDatatypeURI();
if (datatype.equals(XSD.xint.toString())) { if (datatype.equals(XSD.xint.toString())) {
int i1 = Integer.valueOf(s1.getData()); int i1 = Integer.valueOf(dps1.getData());
int i2 = Integer.valueOf(s2.getData()); int i2 = Integer.valueOf(dps2.getData());
result = ((Integer) i1).compareTo(i2); result = ((Integer) i1).compareTo(i2);
} }
else if (datatype.equals(XSD.xstring.toString())) { else if (datatype.equals(XSD.xstring.toString())) {
result = s1.getData().compareTo(s2.getData()); result = dps1.getData().compareTo(dps2.getData());
} }
// Fill in other types here // Fill in other types here
else { else {
throw new ClassCastException("Unsupported datatype"); throw new ClassCastException("Unsupported datatype");
} }
}
return result; return result;
} }