Changeset 611 for trunk/include/functions_metadata.inc.php

Timestamp:

Nov 20, 2004, 7:07:51 PM (19 years ago)

Author:

plg

Message:

takes not only the first keyword in IPTC field 2#025

File:

• trunk/include/functions_metadata.inc.php (modified) (2 diffs)

trunk/include/functions_metadata.inc.php

@@ -51 +51 @@
       foreach (array_keys($rmap) as $iptc_key)
       {
-        if (isset($iptc[$iptc_key][0]) and $value = $iptc[$iptc_key][0])
+        if (isset($iptc[$iptc_key][0]))
         {
-          // strip leading zeros (weird Kodak Scanner software)
-          while ($value[0] == chr(0))
+          if ($iptc_key == '2#025')
           {
-            $value = substr($value, 1);
+            $value = implode(',',
+                             array_map('clean_iptc_value',$iptc[$iptc_key]));
           }
-          // remove binary nulls
-          $value = str_replace(chr(0x00), ' ', $value);
-          
+          else
+          {
+            $value = clean_iptc_value($iptc[$iptc_key][0]);
+          }
+
           foreach (array_keys($map, $iptc_key) as $pwg_key)
           {
@@ -71 +73 @@
   return $result;
 }
+
+/**
+ * return a cleaned IPTC value
+ *
+ * @param string value
+ * @return string
+ */
+function clean_iptc_value($value)
+{
+  // strip leading zeros (weird Kodak Scanner software)
+  while ($value[0] == chr(0))
+  {
+    $value = substr($value, 1);
+  }
+  // remove binary nulls
+  $value = str_replace(chr(0x00), ' ', $value);
+  
+  return $value;
+}
 ?>