Changeset 6544

Timestamp:

2004-01-19T15:38:42+13:00 (20 years ago)

Author:

kjdon

Message:

the bit where you put language items into the indexexparr was comparing them unnecessarily to the entries in the collect.cfg. don't know why but it wasn't working so I deleted that bit. also added the lang stuff to the gdbm db so now language subcollections work with mgpp

File:

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

trunk/gsdl/perllib/mgppbuilder.pm

@@ -169 +169 @@
         else { # add in an empty subcollection field
             push (@{$self->{'collect_cfg'}->{'indexes'}}, "$index\:\:$language");
+           
         }       
         }
@@ -513 +514 @@
     if ($plang =~ /\w/ && !defined ($mapping{'languagemap'}{$languages})) {
         $mapping{'languagemap'}{$languages} = $plang;
-        push (@{$mapping{'languagemaporder'}}, $language);
+        push (@{$mapping{'languagemaporder'}}, $languages);
         $mapping{$languages} = $plang;
     }
@@ -649 +650 @@
     # a language subcollection - only put languages expressions for the 
     # ones we want in the index
-
+    
     my @languages = ();
     @languages = split /,/, $language if (defined $language);
@@ -657 +658 @@
         $not = 1;
     }
-    foreach $lang (@{$self->{'collect_cfg'}->{'languages'}}) {
-        if ($lang eq $language) {
-        if ($not) {
-            push (@$indexexparr, "!Language/$language/");
-        } else {
-            push (@$indexexparr, "Language/$language/");
-        }
-        last;
-        }
+    if ($not) {
+        push (@$indexexparr, "!Language/$language/");
+    } else {
+        push (@$indexexparr, "Language/$language/");
     }
     }
@@ -907 +903 @@
     }
     print $handle $subcoll_entry;
-    #end the collection entry
+     # now add language meta
+    $lang_entry = "";
+    foreach $lang (@{$self->{'index_mapping'}->{'languagemaporder'}}) {
+    if (defined $self->{'collect_cfg'}->{'collectionmeta'}->{".$lang"}) {
+        my $shortname = $self->{'index_mapping'}->{$lang};
+        $one_entry = $self->create_language_db_map(".$lang", $shortname);
+        $lang_entry .= $one_entry;
+    } else {
+        $lang_entry .= "<$shortname>$lang\n";
+    }
+    }
+    print $handle $lang_entry;
+   #end the collection entry
     print $handle "\n" . ('-' x 70) . "\n";