Changeset 1204 for trunk/admin/site_reader_local.php

Timestamp:

Apr 19, 2006, 1:46:53 AM (18 years ago)

Author:

rvelices

Message:

merge r1203 from branch-1_6 into trunk

bug 335: tn_ext, has_high and representative_ext are updated during file
synchronization and not metadata synchronization

File:

• trunk/admin/site_reader_local.php (modified) (11 diffs)

trunk/admin/site_reader_local.php

@@ -45 +45 @@
 {
   global $errors;
-  
+
   if (!is_dir($this->site_url))
   {
@@ -55 +55 @@
         )
       );
-    
+
     return false;
   }
-  
+
   return true;
 }
@@ -78 +78 @@
 {
   global $conf;
-  if (!isset($conf['flip_picture_ext']))
-  {
-    $conf['flip_picture_ext'] = array_flip($conf['picture_ext']);
-  }
   if (!isset($conf['flip_file_ext']))
   {
@@ -98 +94 @@
         $filename_wo_ext = get_filename_wo_extension($node);
 
-        // searching the thumbnail
-        $tn_ext = $this->get_tn_ext($path, $filename_wo_ext);
-
-        if (isset($conf['flip_picture_ext'][$extension]))
+        if ( isset($conf['flip_file_ext'][$extension]) )
         {
+          $tn_ext = $this->get_tn_ext($path, $filename_wo_ext);
           $fs[ $path.'/'.$node ] = array(
             'tn_ext' => $tn_ext,
-            'has_high' => $this->get_has_high($path, $node)
             );
         }
-        else if (isset($conf['flip_file_ext'][$extension]))
-        { // file not a picture
-          $representative_ext = $this->get_representative_ext($path, $filename_wo_ext);
-
-          $fs[ $path.'/'.$node ] = array(
-            'tn_ext' => $tn_ext,
-            'representative_ext' => $representative_ext
-            );
-        }
-
       }
       elseif (is_dir($path.'/'.$node)
@@ -141 +124 @@
 
 // returns the name of the attributes that are supported for
-// update/synchronization according to configuration
+// files update/synchronization
 function get_update_attributes()
 {
-  global $conf;
-  
-  $update_fields = array(
-    'has_high', 'representative_ext', 'filesize', 'width', 'height'
-    );
-  
+  return array('tn_ext', 'has_high', 'representative_ext');
+}
+
+function get_element_update_attributes($file)
+{
+  global $conf;
+  $data = array();
+
+  $filename = basename($file);
+  $dirname = dirname($file);
+  $filename_wo_ext = get_filename_wo_extension($filename);
+  $extension = get_extension($filename);
+
+  $data['tn_ext'] = $this->get_tn_ext($dirname, $filename_wo_ext);
+  $data['has_high'] = $this->get_has_high($dirname, $filename);
+
+  if ( !isset($conf['flip_picture_ext'][$extension]) )
+  {
+    $data['representative_ext'] = $this->get_representative_ext(
+        $dirname, $filename_wo_ext
+      );
+  }
+  return $data;
+}
+
+// returns the name of the attributes that are supported for
+// metadata update/synchronization according to configuration
+function get_metadata_attributes()
+{
+  global $conf;
+
+  $update_fields = array('filesize', 'width', 'height');
+
   if ($conf['use_exif'])
   {
@@ -167 +177 @@
         );
   }
-  
+
   return $update_fields;
 }
 
 // returns a hash of attributes (metadata+filesize+width,...) for file
-function get_element_update_attributes($file)
+function get_element_metadata($file)
 {
   global $conf;
@@ -182 +192 @@
   $data = array();
 
-  $filename = basename($file);
-  
-  $data['has_high'] = $this->get_has_high(dirname($file), $filename);
-  
-  $data['representative_ext'] = $this->get_representative_ext(
-    dirname($file),
-    get_filename_wo_extension($filename)
-    );
-
   $data['filesize'] = floor(filesize($file)/1024);
+
   if ($image_size = @getimagesize($file))
   {
@@ -222 +224 @@
     }
   }
-  
+
   return $data;
 }
@@ -246 +248 @@
 {
   global $conf;
-  
+
   $base_test =
     $path.'/thumbnail/'.$conf['prefix_thumbnail'].$filename_wo_ext.'.';
-  
+
   foreach ($conf['picture_ext'] as $ext)
   {
@@ -258 +260 @@
     }
   }
-  
+
   return null;
 }
@@ -268 +270 @@
     return 'true';
   }
-  
+
   return null;
 }