Changeset 6076

Timestamp:

May 5, 2010, 1:45:20 AM (14 years ago)

Author:

plg

Message:

feature 620: ability to synchronize metadata from high definition photo, if no
metadata available in "web sized" photo. This commit is a report of r4683 from
update_metadata function in admin/include/functions_metadata.php in the
duplicated code get_element_metadata of admin/site_reader_local.php. See
feature 620 for details about code duplication.

File:

• trunk/admin/site_reader_local.php (modified) (1 diff)

trunk/admin/site_reader_local.php

@@ -206 +206 @@
   if ($conf['use_exif'])
   {
-    $data = array_merge($data, get_sync_exif_data($file) );
+    $exif = get_sync_exif_data($file);
+    if (count($exif) == 0 and isset($data['high_filesize']))
+    {
+      $exif = get_sync_exif_data($high_file);
+    }
+    $data = array_merge($data, $exif);
   }
 
   if ($conf['use_iptc'])
   {
-    $data = array_merge($data, get_sync_iptc_data($file) );
+    $iptc = get_sync_iptc_data($file);
+    if (count($iptc) == 0 and isset($data['high_filesize']))
+    {
+      $iptc = get_sync_iptc_data($high_file);
+    }
+    $data = array_merge($data, $iptc);
   }