Changeset 7511 for extensions/AMetaData/JpegMetaData/JpegMetaData.class.php
- Timestamp:
- Oct 31, 2010, 10:48:27 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/JpegMetaData/JpegMetaData.class.php
r7441 r7511 101 101 * | | | . add XML <lr:hierarchicalSubject> markup 102 102 * | | | 103 * | | | 104 * | | | 105 * | | | 103 * | | | * mantis bug:1975 104 * | | | . Implement COM segment as a tag 105 * | | | 106 * | | | * mantis bug:1976 107 * | | | . Implement keywords as magic tag 106 108 * | | | 107 109 * | | | … … 242 244 'maker' => true, 243 245 'magic' => true, 246 'com' => true 244 247 ); 245 248 … … 275 278 $list[]="magic"; 276 279 280 if($default['com']) 281 $list[]="com"; 282 277 283 foreach($list as $val) 278 284 { … … 300 306 $tmp=new MagicTags(); 301 307 $schema=Schemas::MAGIC; 308 break; 309 case "com": 310 $tmp=new ComTags(); 311 $schema=Schemas::COM; 302 312 break; 303 313 case MAKER_PENTAX: … … 479 489 } 480 490 } 491 elseif($data instanceof ComReader) 492 { 493 $this->loadTags($data->getTags(), Schemas::COM); 494 } 481 495 } 482 496 } … … 577 591 'iptc' => true, 578 592 'xmp' => true, 579 'magic' => true 593 'magic' => true, 594 'com' => true 580 595 ); 581 596 … … 676 691 foreach($returned[1] as $testKey) 677 692 { 678 $found=$found & array_key_exists($testKey, $this->tags);693 $found=$found & (array_key_exists($testKey, $this->tags) and $this->tags[$testKey]->getValue()!=''); 679 694 } 680 695 if(count($returned[1])==0) $found=false; … … 780 795 if($result[4][0]=="W" or $result[4][0]=="S") $num=-$num; 781 796 return($num); 797 case "Author.Keywords": 798 $list=array_flip(array_flip(explode(',', str_replace(array('/', '|', ', '), ',', $value)))); 799 sort($list); 800 return(implode(',', $list)); 801 break; 782 802 default: 783 803 return($value);
Note: See TracChangeset
for help on using the changeset viewer.