Changeset 29422 for main/trunk/greenstone2
- Timestamp:
- 2014-11-12T12:20:21+13:00 (9 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/buildConfigxml.pm
r28876 r29422 376 376 my $sortmap = {}; # maps index name to shortname 377 377 my $sortlist = []; # keeps the order for indexes 378 my $defaultsort = ""; 378 379 379 380 if (defined ($buildcfg->{"indexsortfieldmap"})) { 381 my $first = 1; 382 380 383 my $sortmap_t = $buildcfg->{"indexsortfieldmap"}; 381 384 foreach my $s (@$sortmap_t) { 382 385 my ($k, $v) = $s =~ /^(.*)\-\>(.*)$/; 386 $sortmap->{$k} = $v; 383 387 $sortmap->{$v} = $k; 388 if ($first) { 389 $defaultsort = $v; 390 $first = 0; 391 } 384 392 } 385 393 } … … 388 396 } 389 397 398 if (defined $collectcfg->{"defaultsort"}) { 399 $defaultsort = $sortmap->{$collectcfg->{"defaultsort"}}; 400 } 390 401 $settings->{'sortlist'} = $sortlist; 391 402 $settings->{'sortmap'} = $sortmap; 403 $settings->{'defaultsort'} = $defaultsort; 392 404 393 405 # facet field list … … 512 524 $sortf = $sortmap->{$sf}; 513 525 } 514 &write_line('COLCFG', ["<sort name=\"", $sortf, "\" shortname=\"", $sf, "\" />"]);526 &write_line('COLCFG', ["<sort name=\"", $sf, "\" shortname=\"", $sortf, "\" />"]); 515 527 516 528 } 517 529 &write_line('COLCFG', ["</sortList>"]); 530 &write_line('COLCFG', ["<defaultSort shortname=\"", $settings->{'defaultsort'}, "\" />"]); 518 531 } 519 532 -
main/trunk/greenstone2/perllib/collConfigxml.pm
r29176 r29422 55 55 "indexfieldoptions" => "indexfieldoptions", 56 56 "sort" => "sortfields", 57 "defaultSort" => "defaultsort", 57 58 "facet" => "facetfields", 58 59 "plugin" => "plugin", … … 101 102 my $hashhashexp = q/^(displayItem)$/; # add other (collectionmeta) element names that should be represented by hashes of hashes here. 102 103 103 my $defaults = q/^(defaultIndex|defaultLevel|default IndexLanguage|languageMetadata)$/;104 my $defaults = q/^(defaultIndex|defaultLevel|defaultSort|defaultIndexLanguage|languageMetadata)$/; 104 105 105 106 # Reads in the model collection configuration file, collectionConfig.xml,
Note:
See TracChangeset
for help on using the changeset viewer.