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

NIHVIVO-3765 strange interaction between add type and recompute inferences

Browse source
This commit is contained in:
stellamit 2012-06-15 18:51:00 +00:00
parent e5509654d2
commit 1ec9a67db3
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
View file

@ -41,10 +41,10 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
} else {
SimpleReasoner simpleReasoner = (SimpleReasoner) sr;
if (simpleReasoner.isABoxReasoningAsynchronous()) {
messageStr = "SimpleReasoner is currently in asynchronous mode so a recompute cannot be started. Please try again later.";
messageStr = "Reasoning is currently in asynchronous mode so a recompute cannot be started. Please try again later.";
} else if (simpleReasoner.isRecomputing()) {
messageStr =
"The SimpleReasoner is currently in the process of " +
"The system is currently in the process of " +
"recomputing inferences.";
} else {
String submit = (String)vreq.getParameter("submit");

15
webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
View file

@ -1560,7 +1560,7 @@ public class SimpleReasoner extends StatementListener {
/*
* reconcile a set of inferences into the application inference model
*/
protected synchronized boolean updateInferenceModel(Model inferenceRebuildModel) {
protected boolean updateInferenceModel(Model inferenceRebuildModel) {
log.info("Updating ABox inference model");
StmtIterator iter = null;
@ -1684,7 +1684,7 @@ public class SimpleReasoner extends StatementListener {
/*
* Asynchronous reasoning mode (DeltaComputer) is used in the case of batch removals.
*/
public synchronized boolean isABoxReasoningAsynchronous() {
public boolean isABoxReasoningAsynchronous() {
if (batchMode1 || batchMode2) {
return true;
} else {
@ -1696,7 +1696,14 @@ public class SimpleReasoner extends StatementListener {
private int eventCount = 0;
@Override
public synchronized void notifyEvent(Model model, Object event) {
public void notifyEvent(Model model, Object event) {
if (event instanceof BulkUpdateEvent) {
handleBulkUpdateEvent(event);
}
}
public synchronized void handleBulkUpdateEvent(Object event) {
if (event instanceof BulkUpdateEvent) {
if (((BulkUpdateEvent) event).getBegin()) {
@ -1732,7 +1739,7 @@ public class SimpleReasoner extends StatementListener {
}
}
}
private synchronized boolean switchBatchModes() {
if (batchMode1) {