From a82f6e65e6ed77d97e2d930c06e11b91b03bde4d Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 27 Oct 2011 21:26:41 +0000
Subject: [PATCH] migration: fixing log message and commenting out obsolete
 display model migration code.

---
 .../vitro/webapp/ontology/update/ABoxUpdater.java  |  2 +-
 .../webapp/servlet/setup/UpdateKnowledgeBase.java  | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
index 6ac7af8bf..16a19f4d1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
@@ -373,7 +373,7 @@ public class ABoxUpdater {
 		   
 		   //log summary of changes
 		   if (count > 0) {
-			   logger.log("Removed " + count + " individual" + ((count > 1) ? "s" : "" + " of type " + deletedClass.getURI()) + " (refs = " + refCount + ")");
+			   logger.log("Removed " + count + " individual" + (((count > 1) ? "s" : "") + " of type " + deletedClass.getURI()) + " (refs = " + refCount + ")");
 		   }
 		   
 		   aboxModel.remove(retractions);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index 431cc1eb4..8c303b2ed 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -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;
@@ -29,10 +26,7 @@ import com.hp.hpl.jena.rdf.model.Resource;
 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;
@@ -116,9 +110,9 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 					  ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE);
 					  //doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms);
 					  //reloadDisplayModel(ctx);
-					  log.info("Migrating display model");
-					  doMigrateDisplayModel(ctx);
-					  log.info("Display model migrated");
+					  log.info("Display model has not been migrated");
+					  //doMigrateDisplayModel(ctx);
+					  //log.info("Display model migrated");
 					  ontologyUpdater.update();
 				  }
 			   } catch (IOException ioe) {
@@ -217,6 +211,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 	}
 	
 	public static void migrateDisplayModel(Model displayModel) {
+		/*
 	    Resource indexRes = displayModel.getResource(
 	    		DisplayVocabulary.DISPLAY_NS + "PrimaryLuceneIndex");
 	    ResourceUtils.renameResource(
@@ -268,6 +263,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 	    		}	    		
 	    	}
 	    }
+	    */
 	}
 	
 	private OntModel loadModelFromDirectory(String directoryPath) {