diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/DateTimeMigration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/DateTimeMigration.java index ed8afb27e..3d773bdb9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/DateTimeMigration.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/DateTimeMigration.java @@ -148,10 +148,10 @@ public class DateTimeMigration { */ public void updateLiterals() throws IOException { - //TODO: look into java locale note: not handling timezones - they are not expected to be in the 1.1.1 data DateFormat yearFormat = new SimpleDateFormat("yyyy"); DateFormat yearMonthFormat = new SimpleDateFormat("yyyy-MM"); DateFormat yearMonthDayFormat = new SimpleDateFormat("yyyy-MM-dd"); + DateFormat yearMonthDayFormat2 = new SimpleDateFormat("dd-MMM-yy"); aboxModel.enterCriticalSection(Lock.WRITE); @@ -189,9 +189,14 @@ public class DateTimeMigration { try { date = yearMonthDayFormat.parse(stmt.getObject().asLiteral().getLexicalForm()); newStmt = ResourceFactory.createStatement(stmt.getSubject(), stmt.getPredicate(), getDateTimeLiteral(date) ); - } catch (ParseException pe) { - logger.log("Parse Exception for yearMonthDay literal: " + stmt.getObject().asLiteral().getLexicalForm() + - ". The following statement has been removed from the knowledge base " + ABoxUpdater.stmtString(stmt)); + } catch (ParseException pe) { + try { + date = yearMonthDayFormat2.parse(stmt.getObject().asLiteral().getLexicalForm()); + newStmt = ResourceFactory.createStatement(stmt.getSubject(), stmt.getPredicate(), getDateTimeLiteral(date) ); + } catch (ParseException pe2) { + logger.log("Parse Exception for yearMonthDay literal: " + stmt.getObject().asLiteral().getLexicalForm() + + ". The following statement has been removed from the knowledge base " + ABoxUpdater.stmtString(stmt)); + } } } else if (ymdtPrecisionURI.equals(precision)) { logger.log("WARNING: unhandled precision found for individual " + stmt.getSubject().getURI() + ": " + precision + 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 07fb45624..80464c773 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 @@ -64,6 +64,7 @@ public class KnowledgeBaseUpdater { long startTime = System.currentTimeMillis(); System.out.println("Migrating the knowledge base"); + logger.log("Started"); try { performUpdate(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java index 72028523f..ac8d8ad9a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java @@ -17,8 +17,7 @@ public class SimpleChangeLogger implements ChangeLogger { private boolean errorsWritten = false; - public SimpleChangeLogger( String logPath, - String errorPath ) { + public SimpleChangeLogger( String logPath, String errorPath ) { File logFile = new File(logPath); File errorFile = new File(errorPath); try {