Merge branch 'master' into develop

sstrickx · Jan 25, 2015 · ecd6afd · ecd6afd
2 parents 678e282 + bd23225
commit ecd6afd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/dist/YahooFinanceAPI-1.0.1.zip b/dist/YahooFinanceAPI-1.0.1.zip
diff --git a/dist/YahooFinanceAPI-1.1.0.zip b/dist/YahooFinanceAPI-1.1.0.zip
diff --git a/src/yahoofinance/Utils.java b/src/yahoofinance/Utils.java
@@ -55,6 +55,10 @@ public static double getDouble(String data) {
                     data = data.substring(0, data.length() - 1);
                     multiplier = 1000000;
                     break;
+                case 'K':
+                    data = data.substring(0, data.length() - 1);
+                    multiplier = 1000;
+                    break;
             }
             result = Double.parseDouble(data) * multiplier;
         } catch (NumberFormatException e) {
@@ -101,6 +105,8 @@ public static double getPercent(double numerator, double denominator) {
     private static String getDividendDateFormat(String date) {
         if(date.matches("[0-9][0-9]-...-[0-9][0-9]")) {
             return "dd-MMM-yy";
+        } else if(date.matches("[0-9]-...-[0-9][0-9]")) {
+            return "d-MMM-yy";
         } else {
             return "MMM d";
         }
@@ -116,6 +122,7 @@ public static Calendar parseDividendDate(String date) {
         if (!Utils.isParseable(date)) {
             return null;
         }
+        date = date.trim();
         SimpleDateFormat format = new SimpleDateFormat(Utils.getDividendDateFormat(date));
         format.setTimeZone(TimeZone.getTimeZone(YahooFinance.TIMEZONE));
         try {
@@ -124,7 +131,15 @@ public static Calendar parseDividendDate(String date) {
             parsedDate.setTime(format.parse(date));
 
             if(parsedDate.get(Calendar.YEAR) == 1970) {
-                parsedDate.set(Calendar.YEAR, today.get(Calendar.YEAR));
+                // Not really clear which year the dividend date is... making a reasonable guess.
+                int monthDiff = parsedDate.get(Calendar.MONTH) - today.get(Calendar.MONTH);
+                int year = today.get(Calendar.YEAR);
+                if(monthDiff > 6) {
+                    year -= 1;
+                } else if(monthDiff < -6) {
+                    year += 1;
+                }
+                parsedDate.set(Calendar.YEAR, year);
             }
 
             return parsedDate;