Changeset 7150

Timestamp:

2004-03-30T13:23:19+12:00 (20 years ago)

Author:

mdewsnip

Message:

Now chooses the English collectionmeta value (if it exists) to be the default, in the absence of a specified default value. If there is no default value and no English value, a random value will be used as the default.

Location:

trunk/gsdl/perllib

Files:

• mgbuilder.pm (modified) (1 diff)
• mgppbuilder.pm (modified) (1 diff)

trunk/gsdl/perllib/mgbuilder.pm

@@ -779 +779 @@
         else {
             my ($l) = $lang =~ /^\[l=(\w*)\]$/;
-            if ($l) {         
+            if ($l) {
             $metadata_entry .= "<$cmetamap:$l>" . 
                 $self->{'collect_cfg'}->{'collectionmeta'}->{$cmeta}->{$lang} . "\n";
+
+            # Use the English value as the default if no default is specified
+            if ($l =~ /en/i) {
+                $default=$self->{'collect_cfg'}->{'collectionmeta'}->{$cmeta}->{$lang};
+            }
             }
         }

trunk/gsdl/perllib/mgppbuilder.pm

@@ -976 +976 @@
     else {
         my ($l) = $lang =~ /^\[l=(\w*)\]$/;
-        if ($l) {         
+        if ($l) {
         $metadata_entry .= "<$mapname:$l>" . 
             $self->{'collect_cfg'}->{'collectionmeta'}->{$metaname}->{$lang} . "\n";
+
+        # Use the English value as the default if no default is specified
+        if ($l =~ /en/i) {
+            $default=$self->{'collect_cfg'}->{'collectionmeta'}->{$metaname}->{$lang};
+        }
         }
     }