Changeset 1973 for trunk/gsdl

Timestamp:

2001-02-14T16:32:45+13:00 (23 years ago)

Author:

kjm18

Message:

fixed up language stuff

File:

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

trunk/gsdl/perllib/mgbuilder.pm

@@ -103 +103 @@
     foreach $language (@{$self->{'collect_cfg'}->{'languages'}}) {
         foreach $index (@$indexes) {
-        push (@{$self->{'collect_cfg'}->{'indexes'}}, "$index:$language");
+        if (defined ($self->{'collect_cfg'}->{'indexsubcollections'})) {
+            push (@{$self->{'collect_cfg'}->{'indexes'}}, "$index:$language");
+        }
+        else { # add in an empty subcollection field
+            push (@{$self->{'collect_cfg'}->{'indexes'}}, "$index\:\:$language");
+        }
         }
     }
@@ -351 +356 @@
         $dirname = $self->make_unique (\%pnames, $index, \$pindex, \$psub, \$plang);
     }
+    $mapping{$index} = $dirname;
 
     # store the mapping orders as well as the maps
+    # also put index, subcollection and language fields into the mapping thing - 
+    # (the full index name (eg document:text:subcol:lang) is not used on
+    # the query page) -these are used for collectionmeta later on
     if (!defined $mapping{'indexmap'}{"$level:$gran"}) {
         $mapping{'indexmap'}{"$level:$gran"} = $pindex;
         push (@{$mapping{'indexmaporder'}}, "$level:$gran");
+        if (!defined $mapping{"$level:$gran"}) {
+        $mapping{"$level:$gran"} = $pindex;
+        }
     }
     if ($psub =~ /\w/ && !defined ($mapping{'subcollectionmap'}{$subcollection})) {
         $mapping{'subcollectionmap'}{$subcollection} = $psub;
         push (@{$mapping{'subcollectionmaporder'}}, $subcollection);
+        $mapping{$subcollection} = $psub;
     }
     if ($plang =~ /\w/ && !defined ($mapping{'languagemap'}{$languages})) {
         $mapping{'languagemap'}{$languages} = $plang;
-        push (@{$mapping{'languagemaporder'}}, $language);
-    }
-    $mapping{$index} = $dirname;
+        push (@{$mapping{'languagemaporder'}}, $languages);
+        $mapping{$languages} = $plang;
+    }
     $dirnames{$dirname} = $index;
     $pnames{'index'}{$pindex} = "$level:$gran";
@@ -471 +484 @@
     # to a subcollection
     my $indexexparr = [];
-    my ($level, $fields, $subcollection) = split (":", $index);
+
+    # there may be subcollection info, and language info. 
+    my ($level, $fields, $subcollection, $language) = split (":", $index);
     my @subcollections = ();
     @subcollections = split /,/, $subcollection if (defined $subcollection);
@@ -482 +497 @@
     
     # add expressions for languages if this index belongs to
-    # a language subcollection
-    foreach $language (@{$self->{'collect_cfg'}->{'languages'}}) {
+    # a language subcollection - only put languages expressions for the 
+    # ones we want in the index
+
+    my @languages = ();
+    @languages = split /,/, $language if (defined $language);
+    foreach $language (@languages) {
+    my $not=0;
     if ($language =~ s/^\!//) {
-        push (@$indexexparr, "!Language/$language/");
-    } else {
-        push (@$indexexparr, "Language/$language/");
+        $not = 1;
+    }
+    foreach $lang (@{$self->{'collect_cfg'}->{'languages'}}) {
+        if ($lang eq $language) {
+        if($not) {
+            push (@$indexexparr, "!Language/$language/");
+        } else {
+            push (@$indexexparr, "Language/$language/");
+        }
+        last;
+        }
     }
     }
@@ -654 +682 @@
             print $handle "<$self->{'index_mapping'}->{$cmeta}>" .
             $self->{'collect_cfg'}->{'collectionmeta'}->{".$cmeta"} . "\n";
-        } else {
+        } 
+        else {
             print $outhandle "mgbuilder: warning bad collectionmeta option '$cmeta' - ignored\n";
         }