Changeset 6920


Ignore:
Timestamp:
09/14/10 19:46:58 (9 years ago)
Author:
grum
Message:

Using metadata on HD picture (fix bug and forgotten files), release 0.5.1
bug:1846

Location:
extensions/AMetaData
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/AMetaData/amd_aip_install.class.inc.php

    r6919 r6920  
    381381      foreach($listToAnalyze[0] as $val) 
    382382      { 
    383         if($val['has_high']===true and $this->config['amd_UseMetaFromHD']=='y') 
     383        if($val['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y') 
    384384        { 
    385385          $this->analyzeImageFile($path."/".dirname($val['path'])."/pwg_high/".basename($val['path']), $val['id']); 
  • extensions/AMetaData/amd_ajax.php

    r6919 r6920  
    441441        { 
    442442          $imageId=$row['imageId']; 
    443           if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y') 
     443          if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y') 
    444444          { 
    445445            $filename=$path."/".dirname($row['path'])."/pwg_high/".basename($row['path']); 
     
    586586            //$mem1=memory_get_usage(); 
    587587            //echo "memory before analyze:".$mem1."\n"; 
    588             if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y') 
     588            if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y') 
    589589            { 
    590590              $returned.=$this->analyzeImageFile($path."/".dirname($row['path'])."/pwg_high/".basename($row['path']), $row['id']); 
  • extensions/AMetaData/amd_pip.class.inc.php

    r6891 r6920  
    6767    $this->pictureProperties['id']=$page['image_id']; 
    6868 
    69     $sql="SELECT ti.path, tai.analyzed FROM ".IMAGES_TABLE." ti 
     69    $sql="SELECT ti.path, tai.analyzed, ti.has_high FROM ".IMAGES_TABLE." ti 
    7070            LEFT JOIN ".$this->tables['images']." tai ON tai.imageId = ti.id 
    7171          WHERE ti.id=".$page['image_id'].";"; 
     
    7373    if($result) 
    7474    { 
     75      $hasHigh=''; 
    7576      while($row=pwg_db_fetch_assoc($result)) 
    7677      { 
    7778        $filename=$row['path']; 
     79        $hasHigh=$row['has_high']; 
    7880        $this->pictureProperties['analyzed']=$row['analyzed']; 
    7981      } 
    8082      $filename=$path."/".$filename; 
    81     } 
     83 
     84      if($hasHigh==='true' and $this->config['amd_UseMetaFromHD']=='y') 
     85      { 
     86        $filename=dirname($filename)."/pwg_high/".basename($filename); 
     87      } 
     88    } 
     89 
     90 
    8291 
    8392    $this->jpegMD->load( 
  • extensions/AMetaData/amd_root.class.inc.php

    r6919 r6920  
    193193      while($row=pwg_db_fetch_assoc($result)) 
    194194      { 
    195         if($row['has_high']===true and $this->config['amd_UseMetaFromHD']=='y') 
     195        if($row['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y') 
    196196        { 
    197197          $this->analyzeImageFile($path."/".dirname($row['path'])."/pwg_high/".basename($row['path']), $row['imageId']); 
Note: See TracChangeset for help on using the changeset viewer.