Changeset 7511 for extensions/AMetaData/JpegMetaData/test/index.php

Timestamp:

Oct 31, 2010, 10:48:27 AM (13 years ago)

Author:

grum

Message:

Update JpegMetadata class to implement COM segment as a tag and keywords in "magic" tags
feature:1975, feature:1976

File:

• extensions/AMetaData/JpegMetaData/test/index.php (modified) (6 diffs)

extensions/AMetaData/JpegMetaData/test/index.php

@@ -74 +74 @@
      7 => "808000",
      8 => "800080",
-     9 => "808080");
+     9 => "808080",
+     10 => "6080F0",
+     11 => "F06080",
+     12 => "80F060",
+     13 => "8080FF",
+     14 => "80FF80",
+     15 => "FF8080" );
 
     $parser = xml_parser_create();
@@ -237 +243 @@
   $page.="<span style='font-family:monospace;'>";
 
-  $jpeg = new JpegReader($file);
+  $jpeg = new JpegReader($file, Array('filter' => JpegMetaData::TAGFILTER_ALL, 'xmp' => false, 'maker' => false, 'iptc' => false, 'exif' => false));
 
   $page2="JpegReader extraction<br>";
@@ -286 +292 @@
         }
       }
+      elseif($data instanceof ComReader)
+      {
+        foreach($data->getTags() as $key2 => $val2)
+        {
+          $page2.="<div style='color:#0000ff;font-weight:normal;margin-left:12px;'>";
+          $page2.=dump_tag($key2, $val2, "");
+          $page2.="</div>";
+        }
+      }
       elseif(is_array($data))
       {
@@ -303 +318 @@
   $page2.="<div style='font-family:monospace;'>JpegMetaData - tag from test file<br>";
   $page2.="<table style='border:1px solid #000000;width:100%;'>";
-  $page2.="<tr style='border-bottom:1x solid #000000;'><th>Key</th><th>Name</th><th>Value</th><th>Computed Value</th></tr>";
+  $page2.="<tr style='border-bottom:1x solid #000000;'><th>Schema</th><th>Key</th><th>Name</th><th>Value</th><th>Computed Value</th></tr>";
 
 
   $time=microtime(true);
-  $jpegmd = new JpegMetaData($file, Array(
-    'filter' => JpegMetaData::TAGFILTER_IMPLEMENTED,
-    'optimizeIptcDateTime' => true)
-  );
+  $jpegmd = new JpegMetaData($file,
+                              Array(
+                                'filter' => JpegMetaData::TAGFILTER_IMPLEMENTED,
+                                'xmp' => true,
+                                'maker' => true,
+                                'iptc' => true,
+                                'magic' => true,
+                                'exif' => true,
+                                'optimizeIptcDateTime' => true
+                              )
+                            );
   $time2=microtime(true);
 
@@ -332 +354 @@
     if(is_array($value))
       $value=print_r($value, true);
-    $page2.="<tr><td>".$key."</td><td>".L10n::get($val->getName())."</td><td>".$value."</td><td style='$style'>".$txt."</td></tr>";
+    $page2.="<tr><td>".$val->getSchema()."</td><td>".$key."</td><td>".L10n::get($val->getName())."</td><td>".$value."</td><td style='$style'>".$txt."</td></tr>";
     $i++;
   }
@@ -342 +364 @@
   $page2.="<table style='border:1px solid #000000;width:100%;'>";
   $page2.="<tr style='border-bottom:1x solid #000000;'><th>Key</th><th>Name</th><th>Implemented</th></tr>";
-  foreach(JpegMetaData::getTagList(Array('filter' => JpegMetaData::TAGFILTER_ALL, 'xmp' => true, 'maker' => true, 'iptc' => true)) as $key => $val)
+  foreach(JpegMetaData::getTagList(
+                                    Array(
+                                      'filter' => JpegMetaData::TAGFILTER_ALL,
+                                      'xmp' => true,
+                                      'maker' => true,
+                                      'iptc' => true,
+                                      'magic' => true,
+                                      'exif' => true,
+                                    )
+                                  ) as $key => $val)
   {
     $val['implemented']?$i++:$j++;