- Timestamp:
- 2010-07-20T15:18:11+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm
r22448 r22451 44 44 45 45 my $arguments = 46 [ ]; 46 [ { 'name' => "metadata_field_separator", 47 'desc' => "{HTMLPlugin.metadata_field_separator}", 48 'type' => "string", 49 'deft' => "" } 50 51 ]; 47 52 48 53 … … 105 110 my $metadata_count = 0; 106 111 112 my $separator = $self->{'metadata_field_separator'}; 113 if ($separator eq "") { 114 undef $separator; 115 } 116 107 117 my @group_list = Image::ExifTool::GetAllGroups(0); 108 118 foreach my $group (@group_list) … … 132 142 } 133 143 134 my $ array= 0;144 my $metadata_done = 0; 135 145 if (ref $value eq 'SCALAR') { 136 146 … … 146 156 } 147 157 elsif (ref $value eq 'ARRAY') { 148 $ array= 1;158 $metadata_done = 1; 149 159 foreach my $v (@$value) { 150 160 push (@{$exif_metadata{$field}}, $self->gsSafe($v)); 151 #print STDERR "**** adding array $field: $v\n";152 161 ++$metadata_count; 153 162 } 154 163 } 155 if (!$array) { 164 else { 165 if (defined $separator) { 166 my @vs = split($separator, $value); 167 $metadata_done = 1; 168 foreach my $v (@vs) { 169 if ($v =~ /\S/) { 170 push (@{$exif_metadata{$field}}, $self->gsSafe($v)); 171 ++$metadata_count; 172 } 173 } 174 } 175 } 176 if (!$metadata_done) { 156 177 push (@{$exif_metadata{$field}}, $self->gsSafe($value)); 157 #print STDERR "**** adding $field: $value\n";158 159 178 ++$metadata_count; 160 179 }
Note:
See TracChangeset
for help on using the changeset viewer.