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

NIHVIVO-3512 added inference rebuild and scratchpad models to assertions-only filter block

Browse source
This commit is contained in:
brianjlowe 2011-12-14 22:22:57 +00:00
parent 96f172d52b
commit 6147a54dc3
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
View file

@ -429,8 +429,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
webappDaoFactory.getObjectPropertyStatementDao() webappDaoFactory.getObjectPropertyStatementDao()
.fillExistingObjectPropertyStatements(this); .fillExistingObjectPropertyStatements(this);
} catch (Exception e) { } catch (Exception e) {
log.error(this.getClass().getName() + log.error("Could not fill existing ObjectPropertyStatements for "
" could not fill existing ObjectPropertyStatements for "
+ this.getURI(), e); + this.getURI(), e);
} }
return this.objectPropertyStatements; return this.objectPropertyStatements;
@ -579,8 +578,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
webappDaoFactory.getObjectPropertyDao() webappDaoFactory.getObjectPropertyDao()
.fillObjectPropertiesForIndividual( this ); .fillObjectPropertiesForIndividual( this );
} catch (Exception e) { } catch (Exception e) {
log.error(this.getClass().getName() + log.error("Could not fillEntityProperties for " + this.getURI(), e);
" could not fillEntityProperties for " + this.getURI());
} }
return this.propertyList; return this.propertyList;
} }
@ -623,9 +621,8 @@ public class IndividualSDB extends IndividualImpl implements Individual {
webappDaoFactory.getDataPropertyStatementDao() webappDaoFactory.getDataPropertyStatementDao()
.fillExistingDataPropertyStatementsForIndividual(this); .fillExistingDataPropertyStatementsForIndividual(this);
} catch (Exception e) { } catch (Exception e) {
log.error(this.getClass().getName() + log.error("Could not fill existing DataPropertyStatements for "
" could not fill existing DataPropertyStatements for " + this.getURI(), e);
+ this.getURI());
} }
return this.dataPropertyStatements; return this.dataPropertyStatements;
} }
@ -639,8 +636,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
webappDaoFactory.getDataPropertyDao() webappDaoFactory.getDataPropertyDao()
.fillDataPropertiesForIndividual( this ); .fillDataPropertiesForIndividual( this );
} catch (Exception e) { } catch (Exception e) {
log.error(this.getClass().getName() + log.error("Could not fill data properties for " + this.getURI(), e);
" could not fill data properties for " + this.getURI());
} }
return this.datatypePropertyList; return this.datatypePropertyList;
} }
@ -686,8 +682,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
.getExternalIds(this.getURI(), null)); .getExternalIds(this.getURI(), null));
this.externalIds = dpsList; this.externalIds = dpsList;
} catch (Exception e) { } catch (Exception e) {
log.error(this.getClass().getName() + log.error("Could not fill external IDs for " + this.getURI(), e);
" could not fill external IDs for " + this.getURI());
} }
return this.externalIds; return this.externalIds;
} }

14
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
View file

@ -21,6 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase; import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup;
public class WebappDaoFactorySDB extends WebappDaoFactoryJena { public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
@ -138,10 +139,17 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
.append(graphVars[i]) .append(graphVars[i])
.append(" != <") .append(" != <")
.append(JenaDataSourceSetupBase.JENA_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_INF_MODEL)
.append("> && ").append(graphVars[i]) .append("> ")
.append(" != <") .append("&& ").append(graphVars[i]).append(" != <")
.append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL) .append(JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL)
.append(">) ) \n"); .append(">")
.append("&& ").append(graphVars[i]).append(" != <")
.append(SimpleReasonerSetup.JENA_INF_MODEL_REBUILD)
.append(">")
.append("&& ").append(graphVars[i]).append(" != <")
.append(SimpleReasonerSetup.JENA_INF_MODEL_SCRATCHPAD)
.append(">")
.append(") ) \n");
break; break;
case INFERENCES_ONLY : case INFERENCES_ONLY :
filterBlock.append("FILTER (") filterBlock.append("FILTER (")

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
View file

@ -40,8 +40,8 @@ public class SimpleReasonerSetup implements ServletContextListener {
public static final String FILE_OF_PLUGINS = "/WEB-INF/resources/reasoner_plugins.txt"; public static final String FILE_OF_PLUGINS = "/WEB-INF/resources/reasoner_plugins.txt";
// Models used during a full recompute of the ABox // Models used during a full recompute of the ABox
static final String JENA_INF_MODEL_REBUILD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-rebuild"; public static final String JENA_INF_MODEL_REBUILD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-rebuild";
static final String JENA_INF_MODEL_SCRATCHPAD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-scratchpad"; public static final String JENA_INF_MODEL_SCRATCHPAD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-scratchpad";
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {