Changeset 25731 for main

Timestamp:

2012-05-31T18:28:07+12:00 (12 years ago)

Author:

ak19

Message:

All collectionmeta, not just description (collectionextra) and name (collectionname), need to be written out as displayItem elements.

File:

• main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl (modified) (1 diff)

main/trunk/greenstone3/bin/script/convert_coll_from_gs2.pl

@@ -155 +155 @@
     $collwriter->startTag('displayItemList');
     foreach my $entry ( keys %$collectionmeta) {
-        if (defined $name_map{$entry}) {
-        my $name= $name_map{$entry};
-        foreach my $lang (keys %{$collectionmeta->{$entry}}) {
-            my $value = $collectionmeta->{$entry}->{$lang};
-            if ($entry =~ /^icon/) {
-            $value = format_icon_value($value);
-            } else {
-            $value = tidy_up_display_item($value);
-            }
-            &output_display($collwriter, $name, $lang, $value);
-        }
-        }
+         # some metadata names need to be specially mapped to other names
+         # most of them however, can retain their original names
+         my $name = (defined $name_map{$entry}) ? $name_map{$entry} : $entry;
+         foreach my $lang (keys %{$collectionmeta->{$entry}}) {
+         my $value = $collectionmeta->{$entry}->{$lang};
+         if ($entry =~ /^icon/) {
+             $value = format_icon_value($value);
+         } else {
+             $value = tidy_up_display_item($value);
+         }
+         &output_display($collwriter, $name, $lang, $value);
+         }
     }
     $collwriter->endTag('displayItemList');