From 394b9bf04c395d90dfc79523bd09e874d56a8146 Mon Sep 17 00:00:00 2001 From: cesarvh Date: Tue, 16 Oct 2018 19:44:11 -0700 Subject: [PATCH] UJ-2: Simplified code --- .../antlr/ANTLRStructuredDateEvaluator.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java index 52d15ae46..654c2fbb7 100644 --- a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java +++ b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java @@ -465,17 +465,16 @@ public class ANTLRStructuredDateEvaluator extends StructuredDateBaseListener imp Integer num2; Integer num3; - if (eraLast) { - // Si - num1 = (Integer) stack.pop(); // year or day - num2 = (Integer) stack.pop(); // month - num3 = (Integer) stack.pop(); // year or day - era = (Era) stack.pop(); // era... - } else { + if (!eraLast) { era = (Era) stack.pop(); // damn eras - num1 = (Integer) stack.pop(); // year or day - num2 = (Integer) stack.pop(); // month - num3 = (Integer) stack.pop(); // day + } + + num1 = (Integer) stack.pop(); // year or day + num2 = (Integer) stack.pop(); // month + num3 = (Integer) stack.pop(); // day + + if (eraLast) { + era = (Era) stack.pop(); } Integer dayOfMonth = num1; @@ -483,8 +482,9 @@ public class ANTLRStructuredDateEvaluator extends StructuredDateBaseListener imp Integer year = num3; if (DateUtils.isValidDate(num3, num2, num1, era)) { - // Do nothing, already in the right format + // Do nothing, already in the right format (Era Year Month Day) } else if (DateUtils.isValidDate(num1, num2, num3, era)) { + // Use other format: Day Month Year Era dayOfMonth = num3; year = num1; } -- 2.47.3