Changeset 6949 for extensions/AMetaData

Timestamp:

Sep 16, 2010, 8:53:47 PM (14 years ago)

Author:

grum

Message:

JpegMetadata => Implement multiple IPTC keywords managements & manage ISO-8859-1 to UTF8 charset
bug:1859, bug:1861

Location:

extensions/AMetaData/JpegMetaData

Files:

• JpegMetaData.class.php (modified) (1 diff)
• Readers/IptcReader.class.php (modified) (2 diffs)

extensions/AMetaData/JpegMetaData/JpegMetaData.class.php

@@ -66 +66 @@
  * | 1.1.1   | 2010-09-13 | * mantis bug:1826
  * |         |            |   . digiKam XMP tags are not recognized
+ * |         |            |
+ * |         |            | * mantis bug:1859
+ * |         |            |   . JpegMetadata class can't manage multiple IPTC
+ * |         |            |     keywords
+ * |         |            |
+ * |         |            | * mantis bug:1861
+ * |         |            |   . Accentued chars from ISO-8859-1 charset are not
+ * |         |            |     recognized
  * |         |            |
  * |         |            |

extensions/AMetaData/JpegMetaData/Readers/IptcReader.class.php

@@ -214 +214 @@
       unset($blocks);
 
+
+      /* for each entries, convert value to human readable tag value
+       *
+       * build a special 'keywords' tag made as an array from all iptc 'keywords' (0x0219) tags found
+       */
+      $keywordsTag=null;
       foreach($this->entries as $key => $tag)
       {
         $this->setTagProperties($tag);
+        if($tag->getId()==0x0219)
+        {
+          if(is_null($keywordsTag))
+          {
+            $keywordsTag=new Tag(
+              0x0219,
+              array($tag->getValue()),
+              $tag->getName(),
+              array($tag->getLabel()),
+              "",
+              $tag->isKnown(),
+              $tag->isImplemented(),
+              $tag->isTranslatable(),
+              $tag->getSchema()
+            );
+          }
+          else
+          {
+            $keywordsTag->setValue(array_merge($keywordsTag->getValue(), array($tag->getValue())));
+            $keywordsTag->setLabel(array_merge($keywordsTag->getLabel(), array($tag->getLabel())));
+          }
+        }
+      }
+      if(!is_null($keywordsTag))
+      {
+        /*
+         * IPTC 'keywords' is stored like XMP 'xmp.dc:subject' (as a 'seq')
+         */
+        $keywordsTag->setValue(
+          array(
+            'type' => 'seq',
+            'values' => $keywordsTag->getValue()
+          )
+        );
+
+        $keywordsTag->setLabel(
+          array(
+            'type' => 'seq',
+            'values' => $keywordsTag->getLabel()
+          )
+        );
+        $this->entries[]=$keywordsTag;
+        unset($keywordsTag);
       }
     }
@@ -306 +355 @@
         case 0x027A: // 2:122 - Writer/Editor
         case 0x0287: // 2:150 - Language Identifier
-          $returned=$values;
+          $returned=utf8_encode($values);
           break;
         case 0x0114: // 1:20  - File Format