From eac8c6316053b2d1ad4847bef40a46c7384e1111 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 22 Jun 2012 19:25:28 +0000
Subject: [PATCH] NIHVIVO-3673 data migration

---
 .../webapp/ontology/update/KnowledgeBaseUpdater.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
index 89c33825c..c8472dbd8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
@@ -91,11 +91,18 @@ public class KnowledgeBaseUpdater {
 	
 	private void performUpdate() throws IOException {
 		
-		// only annotations for 1.5
+		List<AtomicOntologyChange> rawChanges = getAtomicOntologyChanges();
+		
+		AtomicOntologyChangeLists changes = new AtomicOntologyChangeLists(rawChanges,settings.getNewTBoxModel(),settings.getOldTBoxModel());
+		
+        //process the TBox before the ABox
 		log.info("\tupdating tbox annotations");
 	    updateTBoxAnnotations();
+		
+		log.info("\tupdating the abox");
+    	updateABox(changes);
 	}
-	
+		
 	private void performSparqlConstructAdditions(String sparqlConstructDir, OntModel readModel, OntModel writeModel) throws IOException {
 		
 		Model anonModel = performSparqlConstructs(sparqlConstructDir, readModel, true);