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

VIVO-511 allowing only 1 complete migration

Browse source
This commit is contained in:
brianjlowe 2013-11-11 16:03:46 -05:00
parent 5d19e746e1
commit fc90df70f3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
View file

@ -346,7 +346,9 @@ public class KnowledgeBaseUpdater {
} }
public static boolean isUpdatableABoxGraph(String graphName) { public static boolean isUpdatableABoxGraph(String graphName) {
return (!graphName.contains("tbox") && !graphName.contains("filegraph")); return (graphName != null && !graphName.contains("tbox")
&& !graphName.contains("filegraph")
&& !graphName.contains("x-arq:UnionGraph"));
} }
/** /**

2
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
View file

@ -141,7 +141,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
KnowledgeBaseUpdater ontologyUpdater = new KnowledgeBaseUpdater(settings); KnowledgeBaseUpdater ontologyUpdater = new KnowledgeBaseUpdater(settings);
boolean requiredUpdate = ontologyUpdater.updateRequired(ctx); boolean requiredUpdate = ontologyUpdater.updateRequired(ctx);
if(!JenaDataSourceSetupBase.isFirstStartup()) { if(requiredUpdate && !JenaDataSourceSetupBase.isFirstStartup()) {
try { try {
ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE); ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE);
migrationChangesMade = ontologyUpdater.update(ctx); migrationChangesMade = ontologyUpdater.update(ctx);