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

updates to validation for menu management and update for checking default namespace and not throwing error if /individual not found

Browse source
This commit is contained in:
hjkhjk54 2011-07-15 20:35:14 +00:00
parent fdcdb4c34c
commit 1459228d5a
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
View file

@ -56,16 +56,19 @@ public class LocalNamespaceClassUtils {
//Get all namespacs
//There's an APP for that!
OntologyDao dao = vreq.getFullWebappDaoFactory().getOntologyDao();
List<Ontology> onts = dao.getAllOntologies();
for(Ontology on: onts) {
String uri = on.getURI();
if(uri.startsWith(defaultNamespacePattern)) {
String name = on.getName();
String prefix = on.getPrefix();
foundNamespaces.put(uri, name + " (" + prefix + ")");
}
}
//defualt namespace pattern is null if the default namespace does not employ /individual
if(defaultNamespacePattern != null) {
OntologyDao dao = vreq.getFullWebappDaoFactory().getOntologyDao();
List<Ontology> onts = dao.getAllOntologies();
for(Ontology on: onts) {
String uri = on.getURI();
if(uri.startsWith(defaultNamespacePattern)) {
String name = on.getName();
String prefix = on.getPrefix();
foundNamespaces.put(uri, name + " (" + prefix + ")");
}
}
}
return foundNamespaces;
}
@ -73,7 +76,13 @@ public class LocalNamespaceClassUtils {
public static String getDefaultOntologyNamespace(VitroRequest vreq) {
String defaultNamespace= vreq.getWebappDaoFactory().getDefaultNamespace();
//Assuming following linked data approach so expects /individual at end
defaultNamespace = defaultNamespace.substring(0, defaultNamespace.lastIndexOf("/individual")) + "/ontology/";
return defaultNamespace;
int lastIndex = defaultNamespace.lastIndexOf("/individual");
//if namespace is correct
if(lastIndex != -1) {
defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/";
return defaultNamespace;
} else {
return null;
}
}
}