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

fix for NIHVIVO-1898

Browse source
This commit is contained in:
sjm222 2011-01-26 17:35:19 +00:00
parent 54e6abd53b
commit 10fa0622f2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
View file

@ -14,9 +14,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.ontology.DatatypeProperty;
import com.hp.hpl.jena.ontology.Individual; import com.hp.hpl.jena.ontology.Individual;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.util.iterator.ClosableIterator; import com.hp.hpl.jena.util.iterator.ClosableIterator;
@ -130,9 +133,9 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
if (vgrp!=null) { if (vgrp!=null) {
classDao.addVClassesToGroup(vgrp, includeUninstantiatedClasses, getIndividualCount); classDao.addVClassesToGroup(vgrp, includeUninstantiatedClasses, getIndividualCount);
groups.add(vgrp); groups.add(vgrp);
}
}
java.util.Collections.sort(groups); java.util.Collections.sort(groups);
}
}
} finally { } finally {
groupIt.close(); groupIt.close();
} }
@ -186,9 +189,10 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
group.setNamespace(groupInd.getNameSpace()); group.setNamespace(groupInd.getNameSpace());
group.setLocalName(groupInd.getLocalName()); group.setLocalName(groupInd.getLocalName());
try { try {
group.setDisplayRank(Integer.decode(((Literal)(groupInd.getProperty(getOntModel().getDatatypeProperty(VitroVocabulary.DISPLAY_RANK)).getObject())).getString()).intValue()); DatatypeProperty drProp = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createDatatypeProperty(VitroVocabulary.DISPLAY_RANK);
group.setDisplayRank(Integer.decode(((Literal)(groupInd.getProperty(drProp).getObject())).getString()).intValue());
} catch (Exception e) { } catch (Exception e) {
// e.printStackTrace(); e.printStackTrace();
} }
return group; return group;
} }