Changeset 29422 for main/trunk/greenstone2

Timestamp:

2014-11-12T12:20:21+13:00 (9 years ago)

Author:

kjdon

Message:

handling reading in and writing out defaultSort from and to collectionConfig.xml and buildConfig.xml

Location:

main/trunk/greenstone2/perllib

Files:

• buildConfigxml.pm (modified) (3 diffs)
• collConfigxml.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -376 +376 @@
     my $sortmap = {};  # maps index name to shortname
     my $sortlist = []; # keeps the order for indexes
+    my $defaultsort = "";
 
     if (defined ($buildcfg->{"indexsortfieldmap"})) {
+    my $first = 1;
+
     my $sortmap_t = $buildcfg->{"indexsortfieldmap"};
     foreach my $s (@$sortmap_t) {
         my ($k, $v) = $s =~ /^(.*)\-\>(.*)$/;
+        $sortmap->{$k} = $v;
         $sortmap->{$v} = $k;
+        if ($first) {
+        $defaultsort = $v;
+        $first = 0;
+        }
     }
     }
@@ -388 +396 @@
     }
 
+    if (defined $collectcfg->{"defaultsort"}) {
+    $defaultsort = $sortmap->{$collectcfg->{"defaultsort"}};
+    }
     $settings->{'sortlist'} = $sortlist;
     $settings->{'sortmap'} = $sortmap;
+    $settings->{'defaultsort'} = $defaultsort;
 
     # facet field list
@@ -512 +524 @@
         $sortf = $sortmap->{$sf};
         }
-        &write_line('COLCFG', ["<sort name=\"", $sortf, "\" shortname=\"", $sf, "\" />"]);
+        &write_line('COLCFG', ["<sort name=\"", $sf, "\" shortname=\"", $sortf, "\" />"]);
         
     }
     &write_line('COLCFG', ["</sortList>"]);
+    &write_line('COLCFG', ["<defaultSort shortname=\"", $settings->{'defaultsort'}, "\" />"]);
     }
 

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -55 +55 @@
            "indexfieldoptions" => "indexfieldoptions",
            "sort" => "sortfields",
+           "defaultSort" => "defaultsort",
            "facet" => "facetfields", 
            "plugin" => "plugin",
@@ -101 +102 @@
 my $hashhashexp = q/^(displayItem)$/; # add other (collectionmeta) element names that should be represented by hashes of hashes here.
 
-my $defaults = q/^(defaultIndex|defaultLevel|defaultIndexLanguage|languageMetadata)$/;
+my $defaults = q/^(defaultIndex|defaultLevel|defaultSort|defaultIndexLanguage|languageMetadata)$/;
 
 # Reads in the model collection configuration file, collectionConfig.xml,