Changeset 28256 for extensions/Tags2File/db_export_image_metadata_class.php

Timestamp:

Apr 24, 2014, 11:31:29 AM (10 years ago)

Author:

plg

Message:

compatibility Piwigo 2.6

File:

• extensions/Tags2File/db_export_image_metadata_class.php (modified) (6 diffs)

extensions/Tags2File/db_export_image_metadata_class.php

@@ -88 +88 @@
         $this->nbfiles = 0;
 
-        while ($row = mysql_fetch_row($datas)) // row to avoid conflict with name
+        while ($row = pwg_db_fetch_row($datas)) // row to avoid conflict with name
         {               
                 $image_path = $row[5];
-                $has_high = $row[6] === 'true';
                 
                 if ($this->isTest || file_exists($image_path))
@@ -98 +97 @@
                         {
                                 $cmd = $this->convert_row_to_file_exiftool($row);
-                                $this->write_exifCmd($cmd, $image_path, $has_high, $fp_exiftool);
+                                $this->write_exifCmd($cmd, $image_path, $fp_exiftool);
                         }
                         if ($this->use_exiv2)
                         {
                                 $cmd = $this->convert_row_to_file_exiv2($row);
-                                $this->write_exifCmd($cmd, $image_path, $has_high, $fp_exiv2);
+                                $this->write_exifCmd($cmd, $image_path, $fp_exiv2);
                         }
                 }
@@ -169 +168 @@
         $tags = $this->cutString($this->decode_html_string_to_unicode($row[4], true), 64);
         $image_path = $row[5];
-        $has_high = $row[6] === 'true';
         
         $exiv2Cmd = $this->exiv2DefaultCmd;
@@ -228 +226 @@
   }
 
-  private function write_exifCmd($exifCmd, $image_path, $has_high, $fp)
+  private function write_exifCmd($exifCmd, $image_path, $fp)
   {
         $exifCmdN = $exifCmd ." ";
@@ -235 +233 @@
         if ($writeOK)  $this->nbfiles++;
 
-        if ($has_high)
-        {
-                $imageHigh = dirname($image_path) . "/pwg_high/" . basename($image_path);
-                if (file_exists($imageHigh)) 
-                {       $this->write_exifCmd($exifCmd, $imageHigh, false, $fp);  }
-        }
   }
 
@@ -312 +304 @@
         $query_path = $this->isTest ? 'img.file' : 'img.path';
         $query_restriction = $this->isTest ? 'AND (img.id = '.$this->test_img_id.'))' : ')';
+  
         // get direct properties and tags, even if no tags, with either name, comment or tags not null
         // restritive query with image.ID for tests with copied images with file instead of path
-        $img_query = 'SELECT img.name, img.comment, img.author, img.date_creation, GROUP_CONCAT(tags.name), '.$query_path.', has_high
-                FROM '.IMAGES_TABLE.' AS img
-                LEFT OUTER JOIN '.IMAGE_TAG_TABLE.' AS img_tag ON img_tag.image_id = img.id
-                LEFT OUTER JOIN '.TAGS_TABLE.' AS tags ON tags.id = img_tag.tag_id
-                WHERE ( ( LENGTH(img.name) > 0 OR LENGTH(img.comment) > 0 OR LENGTH(img.author) > 0 OR LENGTH(tags.name) > 0 ) '.$query_restriction.'
-                GROUP BY img.id, img.name, img.comment, img.author, '.$query_path.', has_high
-                ORDER BY img.id ASC; ';
+        $img_query = '
+SELECT
+    img.name,
+    img.comment,
+    img.author,
+    img.date_creation,
+    GROUP_CONCAT(tags.name),
+    '.$query_path.'
+  FROM '.IMAGES_TABLE.' AS img
+    LEFT OUTER JOIN '.IMAGE_TAG_TABLE.' AS img_tag ON img_tag.image_id = img.id
+    LEFT OUTER JOIN '.TAGS_TABLE.' AS tags ON tags.id = img_tag.tag_id
+  WHERE ( ( LENGTH(img.name) > 0 OR LENGTH(img.comment) > 0 OR LENGTH(img.author) > 0 OR LENGTH(tags.name) > 0 ) '.$query_restriction.'
+  GROUP BY img.id, img.name, img.comment, img.author, '.$query_path.'
+  ORDER BY img.id ASC
+;';
         
         return pwg_query($img_query);