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

NIHVIVO-3834 fixes sorting of literals without language tags and other issues with language filtering

Browse source
This commit is contained in:
brianjlowe 2012-06-27 16:08:53 +00:00
parent 1a92e0e28b
commit a26e329ed6
3 changed files with 76 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
View file

@ -54,6 +54,10 @@ public class VitroRequest extends HttpServletRequestWrapper {
}
}
public void setRDFService(RDFService rdfService) {
setAttribute("rdfService", rdfService);
}
public void setWebappDaoFactory( WebappDaoFactory wdf){
setAttribute("webappDaoFactory",wdf);
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
View file

@ -97,6 +97,9 @@ public class WebappDaoFactorySDBPrep implements Filter {
Locale locale = locs.nextElement();
langs.add(locale.toString().replace("_", "-"));
}
if (langs.isEmpty()) {
langs.add("en");
}
WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
config.setDefaultNamespace(defaultNamespace);
config.setPreferredLanguages(langs);
@ -114,6 +117,7 @@ public class WebappDaoFactorySDBPrep implements Filter {
wadf = new WebappDaoFactorySDB(rdfService, oms, config);
WebappDaoFactory assertions = new WebappDaoFactorySDB(
rdfService, baseOms, config, SDBDatasetMode.ASSERTIONS_ONLY);
vreq.setRDFService(rdfService);
vreq.setWebappDaoFactory(wadf);
vreq.setAssertionsWebappDaoFactory(assertions);
vreq.setFullWebappDaoFactory(wadf);

112
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
View file

@ -11,6 +11,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -38,7 +39,28 @@ public class LanguageFilteringRDFService implements RDFService {
public LanguageFilteringRDFService(RDFService service, List<String> langs) {
this.s = service;
this.langs = langs;
this.langs = normalizeLangs(langs);
}
private List<String> normalizeLangs(List<String> langs) {
List<String> normalizedLangs = new ArrayList<String>();
String currentBaseLang = null;
for (String lang : langs) {
String normalizedLang = StringUtils.lowerCase(lang);
String baseLang = normalizedLang.split("-")[0];
if (currentBaseLang == null) {
currentBaseLang = baseLang;
} else if (!currentBaseLang.equals(baseLang)) {
if (!normalizedLangs.contains(currentBaseLang)) {
normalizedLangs.add(currentBaseLang);
}
currentBaseLang = baseLang;
}
}
if (currentBaseLang != null && !normalizedLangs.contains(currentBaseLang)) {
normalizedLangs.add(currentBaseLang);
}
return normalizedLangs;
}
@Override
@ -96,7 +118,7 @@ public class LanguageFilteringRDFService implements RDFService {
}
Collections.sort(candidatesForRemoval, new StatementSortByLang());
Iterator<Statement> candIt = candidatesForRemoval.iterator();
String langRegister = "";
String langRegister = null;
boolean chuckRemaining = false;
while(candIt.hasNext()) {
Statement s = candIt.next();
@ -106,10 +128,9 @@ public class LanguageFilteringRDFService implements RDFService {
retractions.add(s);
}
String lang = s.getObject().asLiteral().getLanguage();
if (langRegister == "") {
if (langRegister == null) {
langRegister = lang;
} else if ((langRegister == null && lang != null)
|| (!langRegister.equals(lang)) ) {
} else if (!langRegister.equals(lang)) {
chuckRemaining = true;
retractions.add(s);
}
@ -158,16 +179,15 @@ public class LanguageFilteringRDFService implements RDFService {
}
Collections.sort(candidatesForRemoval, new RowIndexedLiteralSortByLang());
Iterator<RowIndexedLiteral> candIt = candidatesForRemoval.iterator();
String langRegister = "";
String langRegister = null;
boolean chuckRemaining = false;
while(candIt.hasNext()) {
RowIndexedLiteral rlit = candIt.next();
if (chuckRemaining) {
solnList.set(rlit.getIndex(), null);
} else if (langRegister == "") {
} else if (langRegister == null) {
langRegister = rlit.getLiteral().getLanguage();
} else if ((langRegister == null && rlit.getLiteral().getLanguage() != null)
|| (!langRegister.equals(rlit.getLiteral().getLanguage())) ) {
} else if (!langRegister.equals(rlit.getLiteral().getLanguage())) {
chuckRemaining = true;
solnList.set(rlit.getIndex(), null);
}
@ -303,7 +323,41 @@ public class LanguageFilteringRDFService implements RDFService {
s.close();
}
private class RowIndexedLiteralSortByLang implements Comparator<RowIndexedLiteral> {
private class LangSort {
protected int compareLangs(String t1lang, String t2lang) {
t1lang = StringUtils.lowerCase(t1lang);
t2lang = StringUtils.lowerCase(t2lang);
if ( t1lang == null && t2lang == null) {
return 0;
} else if (t1lang == null) {
return 1;
} else if (t2lang == null) {
return -1;
} else {
int t1langPref = langs.indexOf(t1lang);
int t2langPref = langs.indexOf(t2lang);
if (t1langPref == -1 && t2langPref == -1) {
if ("".equals(t1lang) && "".equals(t2lang)) {
return 0;
} else if ("".equals(t1lang) && !("".equals(t2lang))) {
return -1;
} else {
return 1;
}
} else if (t1langPref > -1 && t2langPref == -1) {
return -1;
} else if (t1langPref == -1 && t2langPref > -1) {
return 1;
} else {
return t1langPref - t2langPref;
}
}
}
}
private class RowIndexedLiteralSortByLang extends LangSort implements Comparator<RowIndexedLiteral> {
public int compare(RowIndexedLiteral rilit1, RowIndexedLiteral rilit2) {
if (rilit1 == null || rilit2 == null) {
@ -313,27 +367,11 @@ public class LanguageFilteringRDFService implements RDFService {
String t1lang = rilit1.getLiteral().getLanguage();
String t2lang = rilit2.getLiteral().getLanguage();
if ( t1lang == null && t2lang == null) {
return 0;
} else if (t1lang == null) {
return 1;
} else if (t2lang == null) {
return -1;
} else {
int t1langPref = langs.indexOf(t1lang);
if (t1langPref == -1) {
t1langPref = Integer.MAX_VALUE;
}
int t2langPref = langs.indexOf(t2lang);
if (t2langPref == -1) {
t2langPref = Integer.MAX_VALUE;
}
return t1langPref - t2langPref;
}
return compareLangs(t1lang, t2lang);
}
}
private class StatementSortByLang implements Comparator<Statement> {
private class StatementSortByLang extends LangSort implements Comparator<Statement> {
public int compare(Statement s1, Statement s2) {
if (s1 == null || s2 == null) {
@ -345,23 +383,7 @@ public class LanguageFilteringRDFService implements RDFService {
String s1lang = s1.getObject().asLiteral().getLanguage();
String s2lang = s2.getObject().asLiteral().getLanguage();
if (s1lang == null && s2lang == null) {
return 0;
} else if (s1lang == null) {
return 1;
} else if (s2lang == null) {
return -1;
} else {
int t1langPref = langs.indexOf(s1lang);
if (t1langPref == -1) {
t1langPref = Integer.MAX_VALUE;
}
int t2langPref = langs.indexOf(s2lang);
if (t2langPref == -1) {
t2langPref = Integer.MAX_VALUE;
}
return t1langPref - t2langPref;
}
return compareLangs(s1lang, s2lang);
}
}