Google and Bloomberg Exchange Rate fix. Addendum.

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index f9263236670c1a1db95281255aca6500c20de58e..46e0aa0289f7d0d5aa9958462936354872da2e77 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -185,6 +185,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
                        $contents = url_get_contents($proto.$site.$filename);
                }
        }
+       $val = '';
        if ($provider == 'ECB')
        {
                $contents = str_replace ("<Cube currency='USD'", " <Cube currency='EUR' rate='1'/> <Cube currency='USD'", $contents);
@@ -207,7 +208,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
        }
        elseif ($provider == 'YAHOO')
        {
-               $val = ''; 
                $array = explode(',',$contents); // New operations for YAHOO. Safer.
                $val = $array[1];
                if ($val != 0)
@@ -215,36 +215,20 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
        }
        elseif ($provider == 'GOOGLE')
        {
-               $val = '';
-               
-               $regexp = "%([\d|.]+)\s+{$curr_a}\s+=\s+<span\sclass=(.*)>([\d|.]+)\s+{$curr_b}\s*</span>%s";
-               if (preg_match($regexp, $contents, $matches)) 
-               {
-                       $val = $matches[3];
-                       $val = str_replace(',', '', $val);
+               $val = getInnerStr($contents, '<span class=bld>', ' ');
+               if (empty($val) || $val+0 <= 0.0001) {
+                       // reverse lookup on could not convert for too small values 
+            $filename = "/finance/converter?a=1&from={$curr_b}&to={$curr_a}";
+            $contents = url_get_contents($proto.$site.$filename);
+            $val = getInnerStr($contents, '<span class=bld>', ' ');
+               } else {
                        if ($val != 0)
                                $val = 1 / $val;
                }
-               if (empty($val)) {
-            $filename = "/finance/converter?a=1&from={$curr_b}&to={$curr_a}";
-            $regexp = "%([\d|.]+)\s+{$curr_b}\s+=\s+<span\sclass=(.*)>([\d|.]+)\s+{$curr_a}\s*</span>%s";
-            $contents = url_get_contents($proto.$site.$filename);
-            if (preg_match($regexp, $contents, $matches))  {
-                $val = $matches[3];
-                $val = str_replace(',', '', $val);
-            }
-        }
     }    
        elseif ($provider == 'BLOOMBERG')
        {
-               $val = '';
-               $stmask = ',"price":';
-               $val = strstr($contents, $stmask);
-               $val = trim($val);
-               $val = substr($val, strlen($stmask));
-               $stmask = ',"';
-               $val = strtok($val, $stmask); 
-               $val = trim($val);
+               $val = getInnerStr($contents, ',"price":', ',"');
     }    
        return $val;
 }  /* end function get_extern_rate */
@@ -259,3 +243,15 @@ function get_sql_for_exchange_rates($curr)
                 ORDER BY date_ DESC";
        return $sql;     
 }
+
+function getInnerStr($str, $start, $end) 
+{
+       // $start must be the first occurrence
+       // $start must not be part of $end
+       $val = '';
+       $val = strstr($str, $start);
+       $val = trim($val);
+       $val = substr($val, strlen($start));
+       $val = strtok($val, $end);
+       return trim($val);
+}