Gallery2: More renames

[gallery.git] / gal2 / gal-gen

diff --git a/gal2/gal-gen b/gal2/gal-gen
index 3c1a6e98a81752dde349b14ae5816964b4d52310..96bd65f36942725f14113e2b9d592e2662bdfc34 100755 (executable)
--- a/gal2/gal-gen
+++ b/gal2/gal-gen
@@ -5,7 +5,8 @@
 use strict;
 use warnings;
 
-use lib '/home/mj/web/gal2';
+use FindBin;
+use lib $FindBin::Bin;
 use UCW::Gallery qw(%CF);
 
 use Image::Magick;
@@ -17,7 +18,6 @@ STDOUT->autoflush(1);
 
 UCW::Gallery::LoadConfig;
 
-my $orig_dir = $CF{'OrigDir'};
 my $orig_list = UCW::Gallery::ReadList('gallery.list') or die "Cannot read gallery.list: $!\n";
 
 my $photo_dir = $CF{'PhotoDir'};
@@ -35,7 +35,7 @@ if (-f $photo_meta) {
        $old_meta = UCW::Gallery::ReadMeta($photo_meta);
        # use Data::Dumper; print "Read old meta: ", Dumper($old_meta), "\n";
 }
-my $meta = { 'photo' => {}, 'sequence' => [] };
+my $meta = { 'photo' => {} };
 
 for my $f (@$orig_list) {
        my $id = $f->{id};
@@ -68,10 +68,8 @@ for my $f (@$orig_list) {
                'xf' => $xfrm,
                'w' => $w,
                'h' => $h,
-               'title' => $f->{title},
        };
        $meta->{photo}->{$id} = $m;
-       push @{$meta->{sequence}}, $id;
 
        my $om = $old_meta->{photo}->{$id};
        if ($om &&