Changeset 6889

Timestamp:

Sep 13, 2010, 8:27:14 PM (14 years ago)

Author:

grum

Message:

Update JpegMetadata class to recognize some digiKam xmp tag
bug:1826

Location:

extensions/AMetaData/JpegMetaData

Files:

• JpegMetaData.class.php (modified) (6 diffs)
• Readers/XmpReader.class.php (modified) (2 diffs)
• TagDefinitions/XmpTags.class.php (modified) (1 diff)

extensions/AMetaData/JpegMetaData/JpegMetaData.class.php

@@ -3 +3 @@
  * --:: JPEG MetaDatas ::-------------------------------------------------------
  *
- * Version : 1.0.1
+ * Version : 1.1.0
  * Date    : 2010-07-29
  *
@@ -41 +41 @@
  * | 1.0.0   |            | * first public release
  * |         |            |
- * | 1.0.1   | 2010-07-29 | * mantis bug:1686
+ * | 1.1.0   | 2010-07-29 | * mantis bug:1686
  * |         |            |   . bug reported on IfdReader
  * |         |            |     When sub IFD (0x8769) refers to a sub IFD with
@@ -62 +62 @@
  * |         |            |     the other schema are filtered
  * |         |            |
- * |         |            |
- * |         |            |
- * |         |            |
- * |         |            |
+ * |         |            | * add the "getTag" function
+ * |         |            |
+ * | 1.1.1   | 2010-09-13 | * mantis bug:1826
+ * |         |            |   . digiKam XMP tags are not recognized
  * |         |            |
  * |         |            |
@@ -106 +106 @@
  *  - load
  *  - getTags
+ *  - getTag
  *
  * -----------------------------------------------------------------------------
@@ -449 +450 @@
         foreach($this->tags as $key => $tag)
         {
-          if(!$this->options[$tag->getSchema()]) unset($this->tags[$key]);
+          if(isset($this->options[$tag->getSchema()]) and !$this->options[$tag->getSchema()]) unset($this->tags[$key]);
         }
 
@@ -504 +505 @@
       }
       return($returned);
+    }
+
+
+    /**
+     * This function returns the tag object for the given tag name
+     *
+     * @param String $key : the tag name (ie: "exif.exif.ApertureValue")
+     * @return Tag : the tag object, null if the tag doesn't exist
+     */
+    public function getTag($key)
+    {
+      if(array_key_exists($key, $this->tags))
+      {
+        return($this->tags[$key]);
+      }
+      return(null);
     }
 

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

@@ -229 +229 @@
         case "Iptc4xmpCore:Scene": //bag
         case "Iptc4xmpCore:SubjectCode": //bag
+        case "digiKam:TagsList": //seq
           $child=$node->getFirstChild();
           switch($child->getName())
@@ -527 +528 @@
         case "exif:SubjectArea" : // seq
         case "exif:SubjectLocation" : // seq
+        case "digiKam:TagsList": //seq
           $returned=$value;
           break;

extensions/AMetaData/JpegMetaData/TagDefinitions/XmpTags.class.php

@@ -2013 +2013 @@
       ),
 
+
+      /*
+       * digiKam Schema
+       */
+      'xmlns:digiKam' => Array(
+        'implemented'  => false,
+        'translatable' => false,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "xmlns",
+      ),
+
+      'digiKam:TagsList' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SEQ,
+        'schema'       => "digiKam",
+      ),
+
     );