NIHVIVO-3265 migrate display model 1.3-->1.4
This commit is contained in:
stellamit
parent
7c2cefdcfc
commit
846aca18eb
1 changed files with 37 additions and 153 deletions
|
|
@ -7,10 +7,7 @@ import java.io.FileInputStream;
|
|||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.ServletContextEvent;
|
||||
|
|
@ -24,19 +21,15 @@ import com.hp.hpl.jena.ontology.OntModelSpec;
|
|||
import com.hp.hpl.jena.rdf.model.Model;
|
||||
import com.hp.hpl.jena.rdf.model.ModelFactory;
|
||||
import com.hp.hpl.jena.rdf.model.Property;
|
||||
import com.hp.hpl.jena.rdf.model.RDFNode;
|
||||
import com.hp.hpl.jena.rdf.model.Resource;
|
||||
import com.hp.hpl.jena.rdf.model.ResourceFactory;
|
||||
import com.hp.hpl.jena.rdf.model.Statement;
|
||||
import com.hp.hpl.jena.rdf.model.StmtIterator;
|
||||
import com.hp.hpl.jena.shared.Lock;
|
||||
import com.hp.hpl.jena.util.ResourceUtils;
|
||||
import com.hp.hpl.jena.vocabulary.RDF;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
|
||||
import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
|
||||
import edu.cornell.mannlib.vitro.webapp.ontology.update.KnowledgeBaseUpdater;
|
||||
import edu.cornell.mannlib.vitro.webapp.ontology.update.UpdateSettings;
|
||||
|
||||
|
|
@ -114,9 +107,9 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
try {
|
||||
if (ontologyUpdater.updateRequired()) {
|
||||
ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE);
|
||||
//log.info("Migrating data model");
|
||||
//doMigrateDisplayModel(ctx);
|
||||
//log.info("Display model migrated");
|
||||
log.info("Migrating data model");
|
||||
doMigrateDisplayModel(ctx);
|
||||
log.info("Display model migrated");
|
||||
ontologyUpdater.update();
|
||||
}
|
||||
} catch (IOException ioe) {
|
||||
|
|
@ -136,75 +129,6 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Behavior changed from 1.0
|
||||
*
|
||||
* Replace any triple X P S in the application metadata model
|
||||
* with X P T where X, P, and T are specified in the input file
|
||||
* @param filename containing replacement values
|
||||
* @param OntModelSelector oms
|
||||
*/
|
||||
private void doMiscAppMetadataReplacements(String filename, OntModelSelector oms) {
|
||||
try {
|
||||
Model replacementValues = ModelFactory.createDefaultModel();
|
||||
OntModel applicationMetadataModel = oms.getApplicationMetadataModel();
|
||||
FileInputStream fis = new FileInputStream(new File(filename));
|
||||
replacementValues.read(fis, null);
|
||||
Model retractions = ModelFactory.createDefaultModel();
|
||||
Model additions = ModelFactory.createDefaultModel();
|
||||
StmtIterator replaceIt = replacementValues.listStatements();
|
||||
while (replaceIt.hasNext()) {
|
||||
Statement replacement = replaceIt.nextStatement();
|
||||
applicationMetadataModel.enterCriticalSection(Lock.WRITE);
|
||||
try {
|
||||
StmtIterator stmtIt =
|
||||
applicationMetadataModel.listStatements(
|
||||
replacement.getSubject(),
|
||||
replacement.getPredicate(),
|
||||
(RDFNode) null);
|
||||
while (stmtIt.hasNext()) {
|
||||
Statement stmt = stmtIt.nextStatement();
|
||||
retractions.add(stmt);
|
||||
additions.add(stmt.getSubject(),
|
||||
replacement.getPredicate(),
|
||||
replacement.getObject());
|
||||
}
|
||||
applicationMetadataModel.remove(retractions);
|
||||
applicationMetadataModel.add(additions);
|
||||
} finally {
|
||||
applicationMetadataModel.leaveCriticalSection();
|
||||
}
|
||||
}
|
||||
} catch (FileNotFoundException fnfe) {
|
||||
log.warn("Couldn't find miscellaneous application metadata replacement file: " + filename);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("Error performing miscellaneous application metadata " +
|
||||
" replacements.", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void reloadDisplayModel(ServletContext ctx) {
|
||||
log.info("Reloading display model");
|
||||
Object o = ctx.getAttribute("displayOntModel");
|
||||
if (o instanceof OntModel) {
|
||||
OntModel displayModel = (OntModel) o;
|
||||
displayModel.removeAll((Resource) null, (Property) null, (RDFNode) null);
|
||||
if (displayModel.size() != 0) {
|
||||
log.error("Display model not cleared successfully");
|
||||
}
|
||||
JenaPersistentDataSourceSetup.readOntologyFilesInPathSet(
|
||||
JenaPersistentDataSourceSetup.APPPATH, ctx, displayModel);
|
||||
log.info("Display model reloaded");
|
||||
if (displayModel.size() == 0) {
|
||||
log.warn("Display model empty after reloading");
|
||||
}
|
||||
} else {
|
||||
log.error("No display model found in context");
|
||||
}
|
||||
}
|
||||
|
||||
private void doMigrateDisplayModel(ServletContext ctx) {
|
||||
Object o = ctx.getAttribute("displayOntModel");
|
||||
if (!(o instanceof OntModel)) {
|
||||
|
|
@ -218,86 +142,46 @@ public class UpdateKnowledgeBase implements ServletContextListener {
|
|||
|
||||
Resource browseDataGetterClass = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.BrowseDataGetter");
|
||||
Resource pageDataGetterClass = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData");
|
||||
Resource internalDataGetterClass = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.InternalClassesDataGetter");
|
||||
Resource individualsDataGetterClass = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.IndividualsForClassesDataGetter");
|
||||
|
||||
Resource homeDataGetter = ResourceFactory.createResource(DisplayVocabulary.DISPLAY_NS + "homeDataGetter");
|
||||
Property homeDataGetterProperty = ResourceFactory.createProperty(DisplayVocabulary.DISPLAY_NS + "hasDataGetter");
|
||||
Property dataGetterProperty = displayModel.getProperty(DisplayVocabulary.HAS_DATA_GETTER);
|
||||
|
||||
Resource homeClass = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "Home");
|
||||
Resource classGroupPage = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "ClassGroupPage");
|
||||
Resource homePage = displayModel.getResource(DisplayVocabulary.HOME_PAGE_URI);
|
||||
Resource classGroupPage = displayModel.getResource(DisplayVocabulary.CLASSGROUP_PAGE_TYPE);
|
||||
Resource internalClassesPage = displayModel.getResource(DisplayVocabulary.CLASSINDIVIDUALS_INTERNAL_TYPE);
|
||||
Resource individualsPage = displayModel.getResource(DisplayVocabulary.CLASSINDIVIDUALS_PAGE_TYPE);
|
||||
|
||||
Resource peopleDataGetter = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "peopleDataGetter");
|
||||
Resource researchDataGetter = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "researchDataGetter");
|
||||
Resource organizationsDataGetter = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "organizationsDataGetter");
|
||||
Resource eventsDataGetter = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "eventsDataGetter");
|
||||
|
||||
displayModel.remove(peopleDataGetter, RDF.type, classGroupPage);
|
||||
displayModel.remove(researchDataGetter, RDF.type, classGroupPage);
|
||||
displayModel.remove(organizationsDataGetter, RDF.type, classGroupPage);
|
||||
displayModel.remove(eventsDataGetter, RDF.type, classGroupPage);
|
||||
|
||||
displayModel.add(peopleDataGetter, RDF.type, pageDataGetterClass);
|
||||
displayModel.add(researchDataGetter, RDF.type, pageDataGetterClass);
|
||||
displayModel.add(organizationsDataGetter, RDF.type, pageDataGetterClass);
|
||||
displayModel.add(eventsDataGetter, RDF.type, pageDataGetterClass);
|
||||
|
||||
displayModel.add(homeClass, homeDataGetterProperty, homeDataGetter);
|
||||
displayModel.add(homePage, dataGetterProperty, homeDataGetter);
|
||||
displayModel.add(homeDataGetter, RDF.type, browseDataGetterClass);
|
||||
|
||||
Model additions = ModelFactory.createDefaultModel();
|
||||
Model retractions = ModelFactory.createDefaultModel();
|
||||
|
||||
StmtIterator iter = displayModel.listStatements((Resource) null, RDF.type, internalClassesPage);
|
||||
while (iter.hasNext()) {
|
||||
Statement stmt = iter.next();
|
||||
retractions.add(stmt);
|
||||
additions.add(stmt.getSubject(), RDF.type, internalClassesPage);
|
||||
}
|
||||
|
||||
public static void migrateDisplayModel12(Model displayModel) {
|
||||
|
||||
Resource indexRes = displayModel.getResource(
|
||||
DisplayVocabulary.DISPLAY_NS + "PrimaryLuceneIndex");
|
||||
ResourceUtils.renameResource(
|
||||
indexRes, DisplayVocabulary.DISPLAY_NS + "SearchIndex");
|
||||
Iterator<Resource> pageIt = displayModel.listResourcesWithProperty(
|
||||
RDF.type, displayModel.getResource(
|
||||
DisplayVocabulary.PAGE_TYPE));
|
||||
while (pageIt.hasNext()) {
|
||||
Resource pageRes = pageIt.next();
|
||||
Resource classgroupType = displayModel.getResource(
|
||||
DisplayVocabulary.CLASSGROUP_PAGE_TYPE);
|
||||
Property forClassGroup = displayModel.getProperty(
|
||||
DisplayVocabulary.FOR_CLASSGROUP);
|
||||
if (pageRes.hasProperty(RDF.type, classgroupType)) {
|
||||
displayModel.remove(pageRes, RDF.type, classgroupType);
|
||||
StmtIterator fcgIt = pageRes.listProperties(forClassGroup);
|
||||
List<Resource> classGroupResources = new ArrayList<Resource>();
|
||||
while (fcgIt.hasNext()) {
|
||||
Statement fcgStmt = fcgIt.nextStatement();
|
||||
RDFNode classGroupNode = fcgStmt.getObject();
|
||||
if (!classGroupNode.isURIResource()) {
|
||||
continue;
|
||||
}
|
||||
classGroupResources.add((Resource) classGroupNode);
|
||||
}
|
||||
int classGroupIndex = 0;
|
||||
Iterator<Resource> classGroupResIt =
|
||||
classGroupResources.iterator();
|
||||
while (classGroupResIt.hasNext()) {
|
||||
classGroupIndex++;
|
||||
Resource classGroupRes = classGroupResIt.next();
|
||||
String URIsuffix = "DataGetter" + classGroupIndex;
|
||||
String dataGetterURI = (!pageRes.isAnon())
|
||||
? pageRes.getURI() + URIsuffix
|
||||
: DisplayVocabulary.DISPLAY_NS +
|
||||
"page-" + pageRes.getId().toString() + "-"
|
||||
+ URIsuffix;
|
||||
Resource dataGetterRes = displayModel.createResource(
|
||||
dataGetterURI);
|
||||
pageRes.addProperty(
|
||||
displayModel.getProperty(
|
||||
DisplayVocabulary.HAS_DATA_GETTER),
|
||||
dataGetterRes);
|
||||
dataGetterRes.addProperty(forClassGroup, classGroupRes);
|
||||
dataGetterRes.addProperty(RDF.type, classgroupType);
|
||||
displayModel.removeAll(pageRes, RDF.type, classgroupType);
|
||||
displayModel.removeAll(
|
||||
pageRes, forClassGroup, (RDFNode) null);
|
||||
}
|
||||
}
|
||||
iter = displayModel.listStatements((Resource) null, RDF.type, classGroupPage);
|
||||
while (iter.hasNext()) {
|
||||
Statement stmt = iter.next();
|
||||
retractions.add(stmt);
|
||||
additions.add(stmt.getSubject(), RDF.type, pageDataGetterClass);
|
||||
}
|
||||
|
||||
iter = displayModel.listStatements((Resource) null, RDF.type, individualsPage);
|
||||
while (iter.hasNext()) {
|
||||
Statement stmt = iter.next();
|
||||
retractions.add(stmt);
|
||||
additions.add(stmt.getSubject(), RDF.type, individualsDataGetterClass);
|
||||
}
|
||||
|
||||
displayModel.remove(retractions);
|
||||
displayModel.add(additions);
|
||||
}
|
||||
|
||||
private OntModel loadModelFromDirectory(String directoryPath) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue