NIHVIVO-962 Merge 5539 from branch

This commit is contained in:
jeb228 2010-07-29 13:30:55 +00:00
parent c0ee32b498
commit 98e5283ab1

View file

@ -13,12 +13,10 @@ import java.util.TreeSet;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.ResIterator; import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.filestorage.FileModelHelper; import edu.cornell.mannlib.vitro.webapp.filestorage.FileModelHelper;
import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage; import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
@ -104,9 +102,7 @@ public class ImageSchemaTranslater extends FsuScanner {
Individual file = translateFile(resource, path, "main image"); Individual file = translateFile(resource, path, "main image");
Individual person = fileModelHelper.getIndividualByUri(resource Individual person = fileModelHelper.getIndividualByUri(resource
.getURI()); .getURI());
Property mainImageProperty = resource.getModel().getProperty(VitroVocabulary.IND_MAIN_IMAGE); fileModelHelper.setAsMainImageOnEntity(person, file);
resource.addProperty(mainImageProperty, model.getResource(file.getURI()));
// fileModelHelper.setAsMainImageOnEntity(person, file);
} }
/** /**