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

Cleaned up displayTBox.n3, updated menu management to remove special template for internal class and extended internal class data getter to utilize a custom restricted classes label called 'internal class'

Browse source
This commit is contained in:
hjkhjk54 2011-07-15 18:26:19 +00:00
parent 414b84c2ad
commit 1059d4af68
6 changed files with 118 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

297
webapp/ontologies/app/menuload/displayTBOX.n3
View file

@ -1,43 +1,36 @@
# $This file is distributed under the terms of the license in /doc/license.txt$
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> . @prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
owl:Ontology
#########Classes#########
###Basic
owl:Class
a owl:Class . a owl:Class .
rdfs:range owl:Ontology
a owl:ObjectProperty . a owl:Class .
owl:AnnotationProperty owl:AnnotationProperty
a owl:Class . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#urlMapping>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#requiresBodyTemplate>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#toPage>
a owl:ObjectProperty .
rdfs:label
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>
a owl:ObjectProperty .
owl:DatatypeProperty owl:DatatypeProperty
a owl:Class . a owl:Class .
rdfs:comment owl:ObjectProperty
a owl:DatatypeProperty . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup> ###Display Model
a owl:ObjectProperty . <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#MainMenu>
a owl:Class ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
"individual-menu.ftl"^^xsd:string .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#menuPosition> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#NavigationElement>
a owl:DatatypeProperty . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page>
a owl:Class . a owl:Class .
@ -45,73 +38,86 @@ rdfs:comment
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#HomePage> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#HomePage>
a owl:Class . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDataGetter>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassGroupPage> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassGroupPage>
a owl:Class . a owl:Class .
owl:Class <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#IndividualsForClassesPage>
a owl:Class . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#InternalClassesPage>
a owl:ObjectProperty . a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#title> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DataGetter>
a owl:Class .
########Data Properties#########
###Basic
rdfs:comment
a owl:DatatypeProperty . a owl:DatatypeProperty .
owl:ObjectProperty rdfs:label
a owl:Class . a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#MainMenu>
a owl:Class .
rdfs:domain
a owl:ObjectProperty .
owl:versionInfo owl:versionInfo
a owl:DatatypeProperty . a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#listViewConfigFile> ###Vitro model
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#linkText> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
a owl:DatatypeProperty . a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#NavigationElement>
a owl:Class .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
a owl:DatatypeProperty . a owl:DatatypeProperty .
owl:Ontology ###Display model
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#listViewConfigFile>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#title>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#urlMapping>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#requiresBodyTemplate>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#menuPosition>
a owl:DatatypeProperty ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayLimitAnnot>
"1"^^xsd:int .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#linkText>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasMenuText>
a owl:DatatypeProperty .
######### Object Properties#########
###Basic
rdfs:range
a owl:ObjectProperty .
rdfs:domain
a owl:ObjectProperty .
owl:topObjectProperty
a owl:ObjectProperty .
###Vitro properties without which individual templates throw errors as are required
<http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage>
a owl:ObjectProperty ; a owl:ObjectProperty ;
rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/public#File> ; rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/public#File> ;
rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> , owl:topObjectProperty . rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> , owl:topObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#urlMapping>
a owl:DatatypeProperty .
owl:AnnotationProperty
a owl:Class .
rdfs:range
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#requiresBodyTemplate>
a owl:DatatypeProperty .
<http://vivo.library.cornell.edu/ns/0.1#n6248>
a owl:Thing ;
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-25T17:34:16"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink>
a owl:ObjectProperty ; a owl:ObjectProperty ;
rdfs:label "Primary Link"@en-US ; rdfs:label "Primary Link"@en-US ;
@ -128,126 +134,6 @@ rdfs:range
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
"true"^^xsd:boolean . "true"^^xsd:boolean .
<http://vivo.library.cornell.edu/ns/0.1#n833>
a owl:Thing ;
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-26T13:23:49"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#toPage>
a owl:ObjectProperty .
rdfs:label
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#restrictResultsByClass>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>
a owl:ObjectProperty .
<http://vivo.library.cornell.edu/ns/0.1#n3490>
a owl:Thing ;
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-26T10:30:02"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#getIndividualsForClass>
a owl:ObjectProperty .
owl:DatatypeProperty
a owl:Class .
rdfs:comment
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasMenuText>
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#intersectsWithClass>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#IndividualsForClassesPage>
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page>
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#menuPosition>
a owl:DatatypeProperty ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayLimitAnnot>
"1"^^xsd:int .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasClassIntersection>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassIntersectionPage>
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#HomePage>
a owl:Class .
<http://vivo.library.cornell.edu/ns/0.1#n1077>
a owl:Thing ;
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-26T13:53:52"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassGroupPage>
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDataGetter>
a owl:ObjectProperty .
owl:Class
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#title>
a owl:DatatypeProperty .
owl:ObjectProperty
a owl:Class .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#MainMenu>
a owl:Class ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
"individual-menu.ftl"^^xsd:string .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassIntersection>
a owl:Class .
rdfs:domain
a owl:ObjectProperty .
owl:versionInfo
a owl:DatatypeProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#listViewConfigFile>
a owl:DatatypeProperty .
<http://vivo.library.cornell.edu/ns/0.1#n7237>
a owl:Thing ;
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-26T13:34:02"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink>
a owl:ObjectProperty ; a owl:ObjectProperty ;
rdfs:label "Additional Link"@en-US ; rdfs:label "Additional Link"@en-US ;
@ -264,31 +150,24 @@ owl:versionInfo
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot> <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
"true"^^xsd:boolean . "true"^^xsd:boolean .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DataGetter> ###Display model
a owl:Class . <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement>
a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#linkText> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>
a owl:DatatypeProperty . a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#NavigationElement> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#toPage>
a owl:Class . a owl:ObjectProperty .
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
a owl:DatatypeProperty . a owl:ObjectProperty .
<http://vivo.library.cornell.edu/ns/0.1#n6377> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDataGetter>
a owl:Thing ; a owl:ObjectProperty .
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-26T11:29:19"^^xsd:dateTime .
<http://vivo.library.cornell.edu/ns/0.1#n1847> <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#getIndividualsForClass>
a owl:Thing ; a owl:ObjectProperty .
rdfs:label "testname"@en-US ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
"1"^^xsd:int ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
"2011-05-25T17:36:03"^^xsd:dateTime .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#restrictResultsByClass>
a owl:ObjectProperty .

7
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
View file

@ -352,14 +352,7 @@ public class MenuManagementEdit extends VitroHttpServlet {
dataGetterModel = getIndividualsForClassesDataGetter(vreq, dataGetterResource, addModel, displayModel, pageResource); dataGetterModel = getIndividualsForClassesDataGetter(vreq, dataGetterResource, addModel, displayModel, pageResource);
} }
addModel.add(dataGetterModel); addModel.add(dataGetterModel);
//Also add special template to page
addModel.add(addModel.createStatement(pageResource,
DisplayVocabulary.REQUIRES_BODY_TEMPLATE,
addModel.createTypedLiteral(DisplayVocabulary.INTERNAL_CLASS_TEMPLATE)));
} }
} }

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java
View file

@ -83,6 +83,7 @@ public class MenuManagementController extends FreemarkerHttpServlet {
//Certain parameters are always passed //Certain parameters are always passed
private void initializeData(Map<String, Object> data, VitroRequest vreq) { private void initializeData(Map<String, Object> data, VitroRequest vreq) {
//Form url submission //Form url submission
data.put("title", getCommand(vreq) + " Menu Item");
data.put("formUrls", vreq.getContextPath() + SUBMIT_FORM); data.put("formUrls", vreq.getContextPath() + SUBMIT_FORM);
data.put("cancelUrl", vreq.getContextPath() + CANCEL_FORM); data.put("cancelUrl", vreq.getContextPath() + CANCEL_FORM);
data.put("internalClassUri", ""); data.put("internalClassUri", "");

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
View file

@ -120,7 +120,7 @@ public class DisplayVocabulary {
//URL for menu management //URL for menu management
public static final String PROCESS_MENU_MANAGEMENT_URL = "/processEditDisplayModel"; public static final String PROCESS_MENU_MANAGEMENT_URL = "/processEditDisplayModel";
public static final String REORDER_MENU_URL = PROCESS_MENU_MANAGEMENT_URL + "?cmd=Reorder&" + SWITCH_TO_DISPLAY_MODEL + "=true"; public static final String REORDER_MENU_URL = PROCESS_MENU_MANAGEMENT_URL + "?cmd=Reorder&" + SWITCH_TO_DISPLAY_MODEL + "=true";
public static final String INTERNAL_CLASS_TEMPLATE = "menupage--individualsforclasses.ftl";
/* URIs for some individuals in the dispaly ontology */ /* URIs for some individuals in the dispaly ontology */
public static final String HOME_MENU_ITEM = DISPLAY_NS + "HomeMenuItem"; public static final String HOME_MENU_ITEM = DISPLAY_NS + "HomeMenuItem";

10
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java
View file

@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateMo
*/ */
public class IndividualsForClassesDataGetter implements PageDataGetter{ public class IndividualsForClassesDataGetter implements PageDataGetter{
private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class); private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
protected static String restrictClassesTemplateName = "restricted";
public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){ public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
HashMap<String, Object> data = new HashMap<String,Object>(); HashMap<String, Object> data = new HashMap<String,Object>();
//This is the old technique of getting class intersections //This is the old technique of getting class intersections
@ -116,7 +116,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray); restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray);
//In case just want uris //In case just want uris
data.put("restrictClasses", StringUtils.join(restrictClassesArray, ",")); data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ","));
data.put("restrictVClasses", restrictVClasses); data.put("restrictVClasses", restrictVClasses);
//not sure if this is useful //not sure if this is useful
data.put("restrictVClassGroup", restrictClassesGroup); data.put("restrictVClassGroup", restrictClassesGroup);
@ -204,4 +204,10 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
return 1; return 1;
} }
} }
//Get template parameter
private static String getRestrictClassesTemplateName() {
return restrictClassesTemplateName;
}
} }

5
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java
View file

@ -41,9 +41,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{ public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{
private static final Log log = LogFactory.getLog(InternalClassesDataGetter.class); private static final Log log = LogFactory.getLog(InternalClassesDataGetter.class);
@Override @Override
public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){ public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
HashMap<String, Object> data = new HashMap<String,Object>(); //Set restricted classes template
super.restrictClassesTemplateName = "internalClass";
HashMap<String, Object> data = new HashMap<String,Object>();
//This is the old technique of getting class intersections //This is the old technique of getting class intersections
Map<String, Object> classIntersectionsMap = vreq.getWebappDaoFactory().getPageDao().getClassesAndCheckInternal(pageUri); Map<String, Object> classIntersectionsMap = vreq.getWebappDaoFactory().getPageDao().getClassesAndCheckInternal(pageUri);