Changeset 6093

Timestamp:

May 7, 2010, 12:23:26 PM (14 years ago)

Author:

plg

Message:

bug 1649 fixed: search EXIF/IPTC in the high definition photo if there is no
EXIF/IPTC in the web sized photo.

File:

• trunk/include/picture_metadata.inc.php (modified) (2 diffs)

trunk/include/picture_metadata.inc.php

@@ -30 +30 @@
 if (($conf['show_exif']) and (function_exists('read_exif_data')))
 {
-  if ($exif = @read_exif_data($picture['current']['image_path']))
+  $exif_mapping = array();
+  foreach ($conf['show_exif_fields'] as $field)
+  {
+    $exif_mapping[$field] = $field;
+  }
+
+  $exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
+  if (count($exif) == 0 and $picture['current']['has_high'])
+  {
+    $exif = get_exif_data($picture['current']['high_url'], $exif_mapping);
+  }
+  
+  if (count($exif) > 0)
   {
     $exif = trigger_event('format_exif_data', $exif, $picture['current'] );
@@ -73 +85 @@
 if ($conf['show_iptc'])
 {
-  $iptc = get_iptc_data($picture['current']['image_path'],
-                        $conf['show_iptc_mapping']);
+  $iptc = get_iptc_data($picture['current']['image_path'], $conf['show_iptc_mapping']);
+  if (count($iptc) == 0 and $picture['current']['has_high'])
+  {
+    $iptc = get_iptc_data($picture['current']['high_url'], $conf['show_iptc_mapping']);
+  }
 
   if (count($iptc) > 0)