Changeset 27803 for main/trunk

Timestamp:

2013-07-11T11:44:20+12:00 (11 years ago)

Author:

kjdon

Message:

code for sort and facet lists

Location:

main/trunk/greenstone2/perllib

Files:

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

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -371 +371 @@
     $settings->{'default_db_level'} = $default_db_level;
 
-    
+    # sort field list
+    ######
+
+    my $sortmap = {};  # maps index name to shortname
+    my $sortlist = []; # keeps the order for indexes
+
+    if (defined ($buildcfg->{"indexsortfieldmap"})) {
+    my $sortmap_t = $buildcfg->{"indexsortfieldmap"};
+    foreach my $s (@$sortmap_t) {
+        my ($k, $v) = $s =~ /^(.*)\-\>(.*)$/;
+        $sortmap->{$v} = $k;
+    }
+    }
+    if (defined ($buildcfg->{"indexsortfields"})) {
+    $sortlist = $buildcfg->{"indexsortfields"};
+    }
+
+    $settings->{'sortlist'} = $sortlist;
+    $settings->{'sortmap'} = $sortmap;
+
+    ### TODO make these use facets not the sort list
+    $settings->{'facetlist'} = $sortlist;
+    $settings->{'facetmap'} = $sortmap;
+
+
     return $settings;
 }
@@ -458 +482 @@
     if ($buildtype eq "lucene" || $buildtype eq "mgpp" || $buildtype eq "solr") {
         &write_line('COLCFG', ["<defaultDBLevel shortname=\"", $default_db_level, "\" />"]);
+    }
+
+    # do sort list
+    if ($buildtype eq "lucene" || $buildtype eq "solr") {
+    my $sortlist = $settings->{'sortlist'};
+    my $sortmap = $settings->{'sortmap'};
+    &write_line('COLCFG', ["<sortList>"]);
+    foreach my $sf (@$sortlist) {
+        my $sortf = $sortmap->{$sf};
+        &write_line('COLCFG', ["<sort name=\"", $sortf, "\" shortname=\"", $sf, "\" />"]);
+    }
+    &write_line('COLCFG', ["</sortList>"]);
+    }
+
+    # do facet list
+    if ($buildtype eq "solr") {
+    &write_line('COLCFG', ["<facetList>"]);
+    my $facetlist = $settings->{'facetlist'};
+    my $facetmap = $settings->{'facetmap'};
+    foreach my $ff (@$facetlist) {
+        my $facetf = $facetmap->{$ff};
+        &write_line('COLCFG', ["<facet name=\"", $ff, "\" shortname=\"", $facetf, "\" />"]);
+    }
+    &write_line('COLCFG', ["</facetList>"]);
     }
     # do searchTypeList

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -51 +51 @@
            "defaultIndexLanguage" => "defaultlanguage",
            "index" => "indexes",
+           "sort" => "sortfields",
+           "facet" => "facetfields", 
            "plugin" => "plugin",
            "plugout" => "plugout",
@@ -81 +83 @@
 # ("plugin", "option")
 my $currentIndex = 0;
-my $arrayexp = q/^(index|level|indexOption|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; 
+my $arrayexp = q/^(index|sort|facet|level|indexOption|indexSubcollection|indexLanguage|orthogonalBuildTypes)$/; 
 my $arrayarrayexp = q/^(plugin|classifier)$/; #|buildOption)$/;
 my $hashexp = q/^(subcollection)$/; # add other element names that should be represented by hash expressions here
@@ -196 +198 @@
     #}
  
-    #@ Handle index|level|indexOption|indexSubcollection|indexLanguage 
+    #@ Handle index|sort|facet|level|indexOption|indexSubcollection|indexLanguage 
     elsif ($element =~ /$arrayexp/) {
       my $key = $nameMap->{$element};