Changeset 15003 for gsdl/trunk/perllib/mgppbuilder.pm

Timestamp:

2008-02-22T11:29:52+13:00 (16 years ago)

Author:

davidb

Message:

With the new ability to group collections within a top-level collection, import.pl and buildcol.pl commands can now be given collection names such as "mygroup/demo". Some of the building code -- mostly involved with generating the index files and GDBM files -- had to be updated to correctly handle such compound collection names

File:

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

gsdl/trunk/perllib/mgppbuilder.pm

@@ -201 +201 @@
     &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
 
-    my $basefilename = "text/$self->{'collection'}";
+    my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
+    my $basefilename = &util::filename_cat("text",$collect_tail);
     my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, $basefilename);
     
-   my $osextra = "";
+    my $osextra = "";
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
     $fulltextprefix =~ s@/@\\@g;
@@ -402 +403 @@
     my $indexdir = $self->{'index_mapping'}->{$index};
     &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, $indexdir));
+
+    my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
     my $fullindexprefix = &util::filename_cat ($self->{'build_dir'}, 
                            $indexdir, 
-                           $self->{'collection'});
+                           $collect_tail);
     my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, "text", 
-                           $self->{'collection'});
+                           $collect_tail);
 
     # get any os specific stuff