[testing harness
ganesh@earth.li**20040327041613] {
adddir ./test
hunk ./.fixperms 22
+chmod a+x test/handlers.pl
hunk ./PhotoPub/Config.pm 25
-            $defaultpath %linkroots);
+            $defaultpath %linkroots
+	    $configfile $initbasedir);
hunk ./PhotoPub/Config.pm 67
-my $config;
-
+if(!defined $configfile) {
hunk ./PhotoPub/Config.pm 69
-if($scriptstat[4] < 500) {
-  $config='/etc/photopubrc';
-} else {
-  my @userpw=getpwuid($scriptstat[4])
-    or &$error('config',"Couldn't look up the owner of $0");
-  $config=$userpw[7].'/.photopubrc';
-}
+  if($scriptstat[4] < 500) {
+    $configfile='/etc/photopubrc';
+  } else {
+    my @userpw=getpwuid($scriptstat[4])
+      or &$error('config',"Couldn't look up the owner of $0");
+    $configfile=$userpw[7].'/.photopubrc';
+  }
hunk ./PhotoPub/Config.pm 77
+}
hunk ./PhotoPub/Config.pm 79
+my @initbasedir
+  = defined $initbasedir 
+  ? map { $_ ne '' ? ($_) : () } (split ('/',$initbasedir))
+  : ();
+
hunk ./PhotoPub/Config.pm 86
-&dynamicconfig($config,[],[]);
+&dynamicconfig($configfile,[],[@initbasedir]);
addfile ./test/handlers.pl
hunk ./test/handlers.pl 1
+#!/usr/bin/perl -w
+
+#---libsetup---
+
+# having . in @INC can cause tainting issues for use
+
+no lib '.';
+
+use FindBin;
+BEGIN {
+  ($dir)=($FindBin::Bin=~/^([\w\d\-\/\.]+)$/)
+    or die "invalid current directory $FindBin::Bin";
+}
+use lib $dir;
+
+#---endlibsetup---
+
+use Cwd;
+
+use PhotoPub::Global qw(&init);
+use PhotoPub::CLBase qw();
+
+BEGIN {
+  chdir($dir);
+  $PhotoPub::Config::configfile='scratch/photopubrc';
+  $PhotoPub::Config::initbasedir=getcwd();
+  $PhotoPub::Global::error=sub { };
+}
+
+use PhotoPub::Config qw();
+use PhotoPub::Handlers qw(&listhandlephoto);
+
+foreach my $script (@ARGV) {
+  open SCRIPT,"<$script" or die "Couldn't read $script";
+  my $untilend=sub {
+    my $finished=0;
+    my $tocall=shift;
+    my $readline=sub {
+      return undef if $finished;
+      return undef if eof(SCRIPT);
+      my $in;
+      do {
+	$in=<SCRIPT>;
+      } while($in=~/^#/);
+      if($in=~/^:\}/) {
+	$finished=1;
+	return undef;
+      } else {
+	return $in;
+      }
+    };
+    &$tocall(@_,$readline);
+    if(!$finished) {
+      my $in;
+      do {
+	$in=&$readline();
+      } until(!defined $in);
+    }
+  };
+    
+  while(<SCRIPT>) {
+    if(/^::init/) {
+      &init()
+    } elsif(/^:{write (.*)$/) {
+      &$untilend(\&write,$1);
+    } elsif(/^:{append (.*)$/) { 
+      &$untilend(\&append,$1);
+    } elsif(/^::run (.*)$/) {
+      system($1);
+    } elsif(/^:{album (.*)$/) {
+      &$untilend(\&album,$1);
+    } elsif(/^::sleep (.*)$/) {
+      sleep($1);
+    }
+  }
+  close SCRIPT;
+}
+
+sub album {
+  my ($album,$readline)=@_;
+  chop($album) if substr($album,-1) eq '/';
+  my $items=&listhandlephoto('album',$album);
+  my $got;
+  my $expected;
+  foreach my $item (@$items) {
+    if($item->{'type'} eq 'group') {
+      $got='range '.$item->{'range'}.' '.$item->{'description'}."\n";
+    } else {
+      $got='album '.$item->{'album'}.' '.$item->{'title'}."\n";
+    }
+    $expected=&$readline();
+    if(!defined $expected) {
+      print STDERR "Produced unexpected item reading album $album\n";
+      print STDERR " Got: $got";
+    } elsif($expected ne $got) {
+      print STDERR "Mismatch reading album $album\n";
+      print STDERR " Expected: $expected";
+      print STDERR " Got: $got";
+    }
+  }
+  do {
+    $expected=&$readline();
+    if(defined $expected) {
+      print STDERR "Didn't get expected item reading album $album\n";
+      print STDERR " Expected: $expected";
+    }
+  } while(defined $expected);
+}
+
+sub write {
+  my ($file,$readline)=@_;
+  open FILE,">$file";
+  while(my $data=&$readline()) {
+    print FILE $data;
+  }
+  close FILE;
+}
+
+sub append {
+  my ($file,$readline)=@_;
+  open FILE,">>$file";
+  while(my $data=&$readline()) {
+    print FILE $data;
+  }
+  close FILE;
+}
addfile ./test/test1
hunk ./test/test1 1
-
+::run test -d scratch || mkdir scratch
+
+:{write scratch/photopubrc
+<imagedirs>
+  dir scratch
+  suffix .jpg
+</imagedirs>
+<infofile>
+  dir scratch
+  filename info
+  allowhtml no
+  makealbum all
+  listblankdir yes
+</infofile>
+:}write
+
+:{write scratch/info
+group 1-5 foo
+:}write
+::init
+:{album /all
+range /1-5 foo
+:}album
+
+::sleep 1
+:{append scratch/info
+group 6-10 bar
+:}append
+
+# If we don't do an init, we still get the old result
+:{album /all
+range /1-5 foo
+:}album
+
+::init
+:{album /all
+range /1-5 foo
+range /6-10 bar
+:}album
+
+::sleep 1
+::run rm scratch/info
+::init
+:{album /all
+# This should probably be range /* Directory /
+range /* Directory 
+:}album
+
+::run rm scratch/*
+::run rmdir scratch
}