Changeset 27392

Timestamp:

2013-05-23T09:29:49+12:00 (11 years ago)

Author:

jmt12

Message:

Correcting bug that left archivedir undefined in some circumstances - code to do this was lurking down in the part that handled building files from cache, so I've moved this into the part that sets up the arguments/options instead. RSS feed files should now be copied correctly. Sorry Anu.

File:

• main/trunk/greenstone2/perllib/buildcolutils.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/buildcolutils.pm

@@ -257 +257 @@
   }
 
+  # - resolve (and possibly set to default) builddir
   if (defined $collectcfg->{'archivedir'} && $self->{'archivedir'} eq "")
   {
     $self->{'archivedir'} = $collectcfg->{'archivedir'};
   }
+  # Modified so that the archivedir, if provided as an argument, is made
+  # absolute if it isn't already
+  if ($self->{'archivedir'} eq "")
+  {
+    $self->{'archivedir'} = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "archives");
+  }
+  else
+  {
+    $self->{'archivedir'} = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir);
+  }
+  # End Mod
+  $self->{'archivedir'} =~ s/[\\\/]+/\//g;
+  $self->{'archivedir'} =~ s/\/$//;
+
+  # - resolve (and possibly set to default) builddir
+  if (defined $collectcfg->{'builddir'} && $self->{'builddir'} eq "")
+  {
+    $self->{'builddir'} = $collectcfg->{'builddir'};
+  }
+  if ($self->{'builddir'} eq "")
+  {
+    $self->{'builddir'} = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, 'building');
+    if ($incremental)
+    {
+      &gsprintf::gsprintf($out, "{buildcol.incremental_default_builddir}\n");
+    }
+  }
+  # - why don't we make builddir absolute similar to archivedir?
+  $self->{'builddir'} =~ s/[\\\/]+/\//g;
+  $self->{'builddir'} =~ s/\/$//;
 
   if (defined $collectcfg->{'cachedir'} && $self->{'cachedir'} eq "")
   {
     $self->{'cachedir'} = $collectcfg->{'cachedir'};
-  }
-
-  if (defined $collectcfg->{'builddir'} && $self->{'builddir'} eq "")
-  {
-    $self->{'builddir'} = $collectcfg->{'builddir'};
   }
 
@@ -448 +474 @@
 
   my ($realarchivedir, $realbuilddir);
-  # Modified so that the archivedir, if provided as an argument, is made
-  # absolute if it isn't already
-  if ($archivedir eq "")
-  {
-    $archivedir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "archives");
-  }
-  else
-  {
-    $archivedir = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir);
-  }
-  # End Mod
-  $archivedir =~ s/[\\\/]+/\//g;
-  $archivedir =~ s/\/$//;
-
-  if ($builddir eq "")
-  {
-    $builddir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, 'building');
-    if ($incremental)
-    {
-      &gsprintf::gsprintf($out, "{buildcol.incremental_default_builddir}\n");
-    }
-  }
-  $builddir =~ s/[\\\/]+/\//g;
-  $builddir =~ s/\/$//;
-  $self->{'builddir'} = $builddir;
-
   # update the archive cache if needed
   if ($cachedir)
@@ -499 +499 @@
     $realbuilddir = $builddir;
   }
+  $self->{'realarchivedir'} = $realarchivedir;
   $self->{'realbuilddir'} = $realbuilddir;
 
@@ -696 +697 @@
   my $rss_items_rdf_file = &FileUtils::filenameConcatenate($self->{'archivedir'}, 'rss-items.rdf');
   # @todo FileUtils
-  if(defined $self->{'builddir'} && -d $self->{'builddir'} && -f $rss_items_rdf_file)
-  {
-    if ($verbosity >= 1)
+  if(defined $self->{'builddir'} && &FileUtils::directoryExists($self->{'builddir'}) && &FileUtils::fileExists($rss_items_rdf_file))
+  {
+    if ($self->{'verbosity'} >= 1)
     {
       &gsprintf::gsprintf($self->{'out'}, "{buildcol.copying_rss_items_rdf}\n");
     }
-    &util::cp($rss_items_rdf_file, $self->{'builddir'});
+    &FileUtils::copyFiles($rss_items_rdf_file, $self->{'builddir'});
   }