Changeset 4698 for extensions/AMetaData/JpegMetaData/Readers/GenericReader.class.php

Timestamp:

Jan 17, 2010, 7:05:35 PM (14 years ago)

Author:

grum

Message:

[Plugin:AMetaData] Finished to comment the JpegMetaData classes and rename some methods

File:

• extensions/AMetaData/JpegMetaData/Readers/GenericReader.class.php (modified) (4 diffs)

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

@@ -111 +111 @@
     /**
      * returns a Tag object from a sequential index
+     * return null if index is out of range
      *
      * @return Tag
@@ -116 +117 @@
     public function getTag($index)
     {
-      return($this->entries[$index]);
+      if($index>=0 and $index<=count($this->entries))
+        return($this->entries[$index]);
+      else
+        return(null);
     }
 
@@ -140 +144 @@
       for($i=0;$i<count($this->entries);$i++)
       {
-        if($this->entries[$i]->getId()==$tagId)
-        {
-          return($i);
+        if($this->entries[$i] instanceof IfdEntryReader)
+        {
+          if($this->entries[$i]->getTagId()==$tagId)
+          {
+            return($i);
+          }
+        }
+        elseif($this->entries[$i] instanceof Tag)
+        {
+          if($this->entries[$i]->getId()==$tagId)
+          {
+            return($i);
+          }
         }
       }
@@ -176 +190 @@
       for($i=0;$i<count($this->entries);$i++)
       {
-        if($this->entries[$i]->getName()==$name)
-        {
-          return($this->entries[$i]);
+        if($this->entries[$i] instanceof IfdEntryReader)
+        {
+          if($this->entries[$i]->getTag()->getName()==$name)
+          {
+            return($this->entries[$i]->getTag());
+          }
+        }
+        elseif($this->entries[$i] instanceof Tag)
+        {
+          if($this->entries[$i]->getName()==$name)
+          {
+            return($this->entries[$i]);
+          }
         }
       }