Changeset 15003

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

Location:

gsdl/trunk/perllib

Files:

• basebuilder.pm (modified) (2 diffs)
• lucenebuilder.pm (modified) (1 diff)
• mgbuilder.pm (modified) (3 diffs)
• mgppbuilder.pm (modified) (2 diffs)
• util.pm (modified) (1 diff)

gsdl/trunk/perllib/basebuilder.pm

@@ -322 +322 @@
     my $dbext = ".bdb";
     $dbext = ".ldb" if &util::is_little_endian();
-    my $fulldbname = &util::filename_cat ($textdir, "$self->{'collection'}$dbext");
+    my $dbname = &util::get_dirsep_tail($self->{'collection'}).$dbext;
+    my $fulldbname = &util::filename_cat ($textdir, $dbname);
     $fulldbname =~ s/\//\\/g if ($ENV{'GSDLOS'} =~ /^windows$/i);
 
@@ -430 +431 @@
     $build_cfg->{'builddate'} = time;
     $build_cfg->{'buildtype'} = $self->{'buildtype'};
-    $build_cfg->{'indexstem'} = $self->{'collection'};
+    $build_cfg->{'indexstem'} = &util::get_dirsep_tail($self->{'collection'});
     $build_cfg->{'stemindexes'} = $self->{'stemindexes'};
     

gsdl/trunk/perllib/lucenebuilder.pm

@@ -367 +367 @@
     my $dbext = ".bdb";
     $dbext = ".ldb" if &util::is_little_endian();
-    my $infodb_file = &util::filename_cat($self->{'build_dir'}, "text", $self->{'collection'} . $dbext);
+
+    my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
+    my $infodb_file = &util::filename_cat($self->{'build_dir'}, "text", $collect_tail . $dbext);
 
     # If we aren't doing an incremental addition, then we just call the super-

gsdl/trunk/perllib/mgbuilder.pm

@@ -127 +127 @@
 
     &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);
 
@@ -315 +317 @@
     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
@@ -522 +526 @@
     my $exe = &util::get_os_exe ();
     my $mgstat_exe = &util::filename_cat($exedir, "mgstat$exe");
-    my $input_file = &util::filename_cat ("text", $self->{'collection'});
+
+    my $collect_tail = &util::get_dirsep_tail($self->{'collection'});
+    my $input_file = &util::filename_cat ("text", $collect_tail);
     if (!-e "$mgstat_exe" || !open (PIPEIN, "mgstat$exe -d \"$self->{'build_dir'}\" -f \"$input_file\" |")) {
     print $outhandle "Warning: Couldn't open pipe to $mgstat_exe to get additional stats\n";

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

gsdl/trunk/perllib/util.pm

@@ -703 +703 @@
 
 
+sub get_dirsep_tail {
+    my ($filename) = @_;
+    
+    # returns last part of directory or filename
+    # On unix e.g. a/b.d => b.d
+    #              a/b/c => c
+
+    my $dirsep = get_dirsep();
+    
+    my ($tail) = ($filename =~ m/^(?:.*?$dirsep)?(.*?)$/);
+
+    return $tail;
+}
+
+
 # if this is running on windows we want binaries to end in
 # .exe, otherwise they don't have to end in any extension