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

Comments

Browse source
This commit is contained in:
rjy7 2010-12-14 19:37:00 +00:00
parent 8b322b960d
commit 42d4c5f0ac
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,5 +56,5 @@ public interface ObjectPropertyDao extends PropertyDao {
public List<ObjectProperty> getObjectPropertyList(String subjectUri);
public String getCustomShortView();
public String getCustomListView();
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
View file

@ -216,7 +216,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
}
@Override
public String getCustomShortView() {
return innerObjectPropertyDao.getCustomShortView();
public String getCustomListView() {
return innerObjectPropertyDao.getCustomListView();
}
}

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

@ -859,7 +859,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
}
@Override
public String getCustomShortView() {
public String getCustomListView() {
//return getPropertyStringValue(, PROPERTY_CUSTOM_LIST_VIEW_ANNOT);
return null;
}

8
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
View file

@ -28,6 +28,14 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
CollatedObjectPropertyTemplateModel(ObjectProperty op, Individual subject, WebappDaoFactory wdf) throws Exception {
super(op, subject, wdf);
/* Change the approach to collation:
* Custom views can get the subclasses in the query. Must use a term ?subclass - throw error if not.
* Default view: we may be able to figure out the class to get subclasses of by inspecting the property.
* If not, use getDirectClasses etc of the object term.
* We need a subclassed and nonsubclassed default query for the default view: collated-query and uncollated-query.
* We can also use these for custom views. Throw error if property is collated but there's no subclass term
* in the query. (The reverse is okay - uncollated property with a subclass term in the query.
*/
String collationTargetError = getCollationTargetError();
if ( ! collationTargetError.isEmpty()) {
String errorMessage = "Collation target error for collated object property " + getName() + ": " +