Unify photo_name

[gallery.git] / gal / bin / gal-cache

diff --git a/gal/bin/gal-cache b/gal/bin/gal-cache
index f5792214c32986a8fda19b70d041a7baa041b44d..73c97db80dfdf0ad4b34d537e6b234dda5801834 100755 (executable)
--- a/gal/bin/gal-cache
+++ b/gal/bin/gal-cache
@@ -18,7 +18,6 @@ my $gal = UCW::Gallery->load_config;
 print "Reading gallery.list\n";
 my $orig_list = $gal->read_list('gallery.list') or die "Cannot read gallery.list: $!\n";
 
-my $photo_dir = $gal->get('PhotoDir');
 my $photo_meta = $gal->photo_meta_name;
 print "Reading meta-data from $photo_meta\n";
 -f $photo_meta or die "Cannot load $photo_meta\n";
@@ -53,7 +52,7 @@ for my $thumb_fmt (@{$gal->get('ThumbFormats')}) {
                print "\t$id: ";
 
                my $p = new Image::Magick;
-               my $photo = File::Spec->catfile($photo_dir, $gal->photo_name($m, $id));
+               my $photo = $gal->photo_name($m, $id);
                my $e;
                $e = $p->Read($photo) and die "Error reading $photo: $e";