Changeset 290 for trunk/gsdl/perllib/mgbuilder.pm

Timestamp:

1999-06-25T11:35:22+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added code to retain the ordering of indexes, subcollections, and languages
in build.cfg.

File:

• trunk/gsdl/perllib/mgbuilder.pm (modified) (4 diffs)

trunk/gsdl/perllib/mgbuilder.pm

@@ -231 +231 @@
 
     my %mapping = ();
+    $mapping{'indexmaporder'} = [];
+    $mapping{'subcollectionmaporder'} = [];
+    $mapping{'languagemaporder'} = [];
     
     # dirnames is used to check for collisions. Start this off
@@ -263 +266 @@
     }
 
-    $mapping{'indexmap'}{"$level:$gran"} = $pindex;
-    $mapping{'subcollectionmap'}{$subcollection} = $psub if $psub =~ /\w/;
-    $mapping{'languagemap'}{$languages} = $plang if $plang =~ /\w/;
+    # store the mapping orders as well as the maps
+    if (!defined $mapping{'indexmap'}{"$level:$gran"}) {
+        $mapping{'indexmap'}{"$level:$gran"} = $pindex;
+        push (@{$mapping{'indexmaporder'}}, "$level:$gran");
+    }
+    if ($psub =~ /\w/ && !defined ($mapping{'subcollectionmap'}{$subcollection})) {
+        $mapping{'subcollectionmap'}{$subcollection} = $psub;
+        push (@{$mapping{'subcollectionmaporder'}}, $subcollection);
+    }
+    if ($plang =~ /\w/ && !defined ($mapping{'languagemap'}{$languages})) {
+        $mapping{'languagemap'}{$languages} = $plang;
+        push (@{$mapping{'languagemaporder'}}, $language);
+    }
     $mapping{$index} = $dirname;
     $dirnames{$dirname} = $index;
@@ -529 +542 @@
     # store the mapping between the index names and the directory names
     my @indexmap = ();
-    foreach $index (keys (%{$self->{'index_mapping'}->{'indexmap'}})) {
+    foreach $index (@{$self->{'index_mapping'}->{'indexmaporder'}}) {
     push (@indexmap, "$index\-\>$self->{'index_mapping'}->{'indexmap'}->{$index}");
     }
@@ -535 +548 @@
 
     my @subcollectionmap = ();
-    foreach $subcollection (keys (%{$self->{'index_mapping'}->{'subcollectionmap'}})) {
-    push (@subcollectionmap, "$subcollection\-\>$self->{'index_mapping'}->{'subcollectionmap'}->{$subcollection}");
+    foreach $subcollection (@{$self->{'index_mapping'}->{'subcollectionmaporder'}}) {
+    push (@subcollectionmap, "$subcollection\-\>$self->{'index_mapping'}->".
+          "{'subcollectionmap'}->{$subcollection}");
     }
     $build_cfg->{'subcollectionmap'} = \@subcollectionmap if scalar (@subcollectionmap);
 
     my @languagemap = ();
-    foreach $language (keys (%{$self->{'index_mapping'}->{'languagemap'}})) {
-    push (@languagemap, "$language\-\>$self->{'index_mapping'}->{'languagemap'}->{$language}");
+    foreach $language (@{$self->{'index_mapping'}->{'languagemaporder'}}) {
+    push (@languagemap, "$language\-\>$self->{'index_mapping'}->{'languagemap'}->".
+          "{$language}");
     }
     $build_cfg->{'languagemap'} = \@languagemap if scalar (@languagemap);