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

Use LinkedHashMap in getMostSpecificTypes method so order is preserved when we get the values in JsonServlet

Browse source
This commit is contained in:
ryounes 2011-07-15 20:49:03 +00:00
parent 7d196832db
commit 593266b512
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
View file

@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -388,7 +389,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
protected static final String MOST_SPECIFIC_TYPE_QUERY = "" protected static final String MOST_SPECIFIC_TYPE_QUERY = ""
+ "PREFIX rdfs: <" + VitroVocabulary.RDFS + "> \n" + "PREFIX rdfs: <" + VitroVocabulary.RDFS + "> \n"
+ "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" + "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n"
+ "SELECT ?label ?type WHERE { \n" + "SELECT DISTINCT ?label ?type WHERE { \n"
+ " ?subject vitro:mostSpecificType ?type . \n" + " ?subject vitro:mostSpecificType ?type . \n"
+ " ?type rdfs:label ?label . \n" + " ?type rdfs:label ?label . \n"
+ " ?type vitro:inClassGroup ?classGroup . \n" + " ?type vitro:inClassGroup ?classGroup . \n"
@ -397,7 +398,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
@Override @Override
/** /**
* Finds all mostSpecificTypes of an individual. * Finds all mostSpecificTypes of an individual that are members of a classgroup.
* Returns a list of type labels. * Returns a list of type labels.
* **/ * **/
public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) { public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) {
@ -415,7 +416,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
return Collections.emptyMap(); return Collections.emptyMap();
} }
Map<String, String> types = new HashMap<String, String>(); Map<String, String> types = new LinkedHashMap<String, String>();
DatasetWrapper w = dwf.getDatasetWrapper(); DatasetWrapper w = dwf.getDatasetWrapper();
Dataset dataset = w.getDataset(); Dataset dataset = w.getDataset();
dataset.getLock().enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);