Changeset 1029 for trunk/tools

Timestamp:

Feb 8, 2006, 2:17:07 AM (18 years ago)

Author:

rvelices

Message:

• remake of Remote sites and Synchronize:
  • synchronization for remote and local sites are done by the same code
  • remote sites can update metadata now (not before) - bug 279
  • fixes bug 82: has_high column

• improve feature 280: user sort by filename

• fix path to template mimetypes icons

• bug 284: session cookie lifetime, deletion on logout and corrected issue

when db upgrades were missing

File:

• trunk/tools/create_listing_file.php (modified) (5 diffs)

trunk/tools/create_listing_file.php

@@ -45 +45 @@
 $conf['version'] = '%PWGVERSION%';
 
-// $conf['use_exif'] set to true if you want to use Exif Date as "creation
-// date" for the element, otherwise, set to false
+// $conf['use_exif'] set to true if you want to use Exif information
 $conf['use_exif'] = true;
+
+// use_exif_mapping: same behaviour as use_iptc_mapping
+$conf['use_exif_mapping'] = array(
+  'date_creation' => 'DateTimeOriginal'
+  );
 
 // $conf['use_iptc'] set to true if you want to use IPTC informations of the
@@ -321 +325 @@
       if ($file != '.'
           and $file != '..'
+          and $file != '.svn'
           and $file != 'thumbnail'
           and $file != 'pwg_high'
@@ -345 +350 @@
     $dirs.= "\n".$indent.'</dir'.$level.'>';
   }
-  return $dirs;         
+  return $dirs;   
 }
 
@@ -426 +431 @@
           if ($exif = @read_exif_data($dir.'/'.$fs_file))
           {
-            if (isset($exif['DateTime']))
+            foreach ($conf['use_exif_mapping'] as $pwg_key => $exif_key )
             {
-              preg_match('/^(\d{4}):(\d{2}):(\d{2})/'
-                         ,$exif['DateTime']
-                         ,$matches);
-              $element['date_creation'] =
-                $matches[1].'-'.$matches[2].'-'.$matches[3];
+              if (isset($exif[$exif_key]))
+              {
+                if ( in_array($pwg_key, array('date_creation','date_available') ) )
+                {
+                   if (preg_match('/^(\d{4}):(\d{2}):(\d{2})/'
+                         ,$exif[$exif_key]
+                         ,$matches))
+                   {
+                     $element[$pwg_key] =
+                        $matches[1].'-'.$matches[2].'-'.$matches[3];
+                   }
+                }
+                else
+                {
+                  $element[$pwg_key] = $exif[$exif_key];
+                }
+              }
             }
           }
@@ -525 +542 @@
     $listing.= ' generation_date="'.date('Y-m-d').'"';
     $listing.= ' phpwg_version="'.$conf{'version'}.'"';
+    
+    $attrs=array();
+    if ($conf['use_iptc'])
+    {
+      $attrs = array_merge($attrs, array_keys($conf['use_iptc_mapping']) );
+    }
+    if ($conf['use_exif'])
+    {
+      $attrs = array_merge($attrs, array_keys($conf['use_exif_mapping']) );
+    }
+    $listing.= ' metadata="'.implode(',',array_unique($attrs)).'"';
     
     $end = strrpos($_SERVER['PHP_SELF'], '/') + 1;