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

NIHVIVO-2449 Remove moniker references

Browse source
This commit is contained in:
ryounes 2011-07-07 15:01:11 +00:00
parent d6f8ac002e
commit 59a23c20bf
4 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
View file

@ -307,7 +307,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
public static final String [] INCLUDED_IN_JSON = { public static final String [] INCLUDED_IN_JSON = {
"URI", "URI",
"name", "name",
"moniker",
"vClassId" "vClassId"
}; };

3
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/FieldVTwo.java
View file

@ -25,7 +25,6 @@ public class FieldVTwo {
STRINGS_VIA_DATATYPE_PROPERTY, STRINGS_VIA_DATATYPE_PROPERTY,
INDIVIDUALS_VIA_OBJECT_PROPERTY, INDIVIDUALS_VIA_OBJECT_PROPERTY,
INDIVIDUALS_VIA_VCLASS, INDIVIDUALS_VIA_VCLASS,
MONIKERS_VIA_VCLASS,
CHILD_VCLASSES, CHILD_VCLASSES,
CHILD_VCLASSES_WITH_PARENT, CHILD_VCLASSES_WITH_PARENT,
VCLASSGROUP, VCLASSGROUP,
@ -286,8 +285,6 @@ public class FieldVTwo {
return FieldVTwo.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY; return FieldVTwo.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY;
} else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) { } else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) {
return FieldVTwo.OptionsType.INDIVIDUALS_VIA_VCLASS; return FieldVTwo.OptionsType.INDIVIDUALS_VIA_VCLASS;
} else if ("MONIKERS_VIA_VCLASS".equalsIgnoreCase(s)) {
return FieldVTwo.OptionsType.MONIKERS_VIA_VCLASS;
} else if ("DATETIME".equalsIgnoreCase(s)) { } else if ("DATETIME".equalsIgnoreCase(s)) {
return FieldVTwo.OptionsType.DATETIME; return FieldVTwo.OptionsType.DATETIME;
} else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) { } else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) {

3
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/Field.java
View file

@ -26,7 +26,6 @@ public class Field {
STRINGS_VIA_DATATYPE_PROPERTY, STRINGS_VIA_DATATYPE_PROPERTY,
INDIVIDUALS_VIA_OBJECT_PROPERTY, INDIVIDUALS_VIA_OBJECT_PROPERTY,
INDIVIDUALS_VIA_VCLASS, INDIVIDUALS_VIA_VCLASS,
MONIKERS_VIA_VCLASS,
CHILD_VCLASSES, CHILD_VCLASSES,
CHILD_VCLASSES_WITH_PARENT, CHILD_VCLASSES_WITH_PARENT,
VCLASSGROUP, VCLASSGROUP,
@ -287,8 +286,6 @@ public class Field {
return Field.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY; return Field.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY;
} else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) { } else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) {
return Field.OptionsType.INDIVIDUALS_VIA_VCLASS; return Field.OptionsType.INDIVIDUALS_VIA_VCLASS;
} else if ("MONIKERS_VIA_VCLASS".equalsIgnoreCase(s)) {
return Field.OptionsType.MONIKERS_VIA_VCLASS;
} else if ("DATETIME".equalsIgnoreCase(s)) { } else if ("DATETIME".equalsIgnoreCase(s)) {
return Field.OptionsType.DATETIME; return Field.OptionsType.DATETIME;
} else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) { } else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) {

28
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/SelectListGenerator.java
View file

@ -282,33 +282,7 @@ public class SelectListGenerator {
} }
} }
break; break;
case MONIKERS_VIA_VCLASS: //so we have a vclass URI
vclassUri = field.getObjectClassUri();
if (vclassUri==null || vclassUri.equals("")){
log.error("no vclassUri found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType MONIKERS_VIA_VCLASS specified");
} else {
// first test to see whether there's a default "leave blank" value specified with the literal options
String defaultOption=null;
if ((defaultOption=getDefaultOption(field))!=null) {
optionsMap.put(LEFT_BLANK, defaultOption);
}
// now populate the options
if( wDaoFact == null ) log.error("could not get WebappDaoFactory from request in SelectListGenerator.getOptions().");
VClass vclass = wDaoFact.getVClassDao().getVClassByURI( vclassUri );
if( vclass == null ) {
log.error("Cannot find owl:Class " + vclassUri + " in the model" );
optionsMap.put("", "Could not find class " + vclassUri);
}else{
List<Individual> individuals = wDaoFact.getIndividualDao().getIndividualsByVClassURI(vclass.getURI(),-1,-1);
if (individuals.size()==0){
log.error("No individuals of type "+vclass.getName()+" to add to pick list in SelectListGenerator.getOptions(); check portal visibility");
optionsMap.put("", "No " + vclass.getName() + " found");
}
}
}
break;
case CHILD_VCLASSES: //so we have a vclass URI case CHILD_VCLASSES: //so we have a vclass URI
vclassUri = field.getObjectClassUri(); vclassUri = field.getObjectClassUri();
if (vclassUri==null || vclassUri.equals("")){ if (vclassUri==null || vclassUri.equals("")){