Changeset 22448

Timestamp:

2010-07-20T14:07:33+12:00 (14 years ago)

Author:

kjdon

Message:

metadata values mught be array type - add each individual item as a separate metadata element

File:

• main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm

@@ -123 +123 @@
             $tag =~ s/^([^\s]+)\s.*$/$1/i;
             my $value = $self->{'exiftool'}->GetValue($tag);
-            if (defined $value && $value =~ /[a-z0-9]+/i)
-              {
-                if (ref $value eq 'SCALAR')
-                  {
-                    if ($$value =~ /^Binary data/)
-                      {
-                        $value = "($$value)";
-                      }
-                    else
-                      {
-                        my $len = length($$value);
-                        $value = "(Binary data $len bytes)";
-                      }
-                  }
+            if (defined $value && $value =~ /[a-z0-9]+/i) {
 
         my $field = "ex.$group.$tag";
@@ -144 +131 @@
             $exif_metadata{$field} = [];
         }
-        push (@{$exif_metadata{$field}}, $self->gsSafe($value));
-##      print STDERR "**** adding $field: $value\n";
-
-        ++$metadata_count;
-              }
+
+        my $array = 0;
+        if (ref $value eq 'SCALAR') {
+            
+                    if ($$value =~ /^Binary data/) {
+            
+                        $value = "($$value)";
+            }
+                    else {
+            
+                        my $len = length($$value);
+                        $value = "(Binary data $len bytes)";
+            }
+        }
+        elsif (ref $value eq 'ARRAY') {
+            $array = 1;
+            foreach my $v (@$value) {
+            push (@{$exif_metadata{$field}}, $self->gsSafe($v));
+            #print STDERR "**** adding array $field: $v\n";
+            ++$metadata_count;
+            }
+        }
+        if (!$array) {
+            push (@{$exif_metadata{$field}}, $self->gsSafe($value));
+            #print STDERR "**** adding $field: $value\n";
+            
+            ++$metadata_count;
+        }
+        }
           }
       }