Bugfixes.

misc-scripts/binary_delta/apply.pl

@@ -44,13 +44,13 @@ if ($#ARGV != 2) {
 }
 
 my $db = $ARGV[0];
-my $v1 = $ARGV[1]; my $v1_dir = sprintf "%s/%s_%s", $src_prefix, $db, $v1;
-my $v2 = $ARGV[2]; my $v2_dir = sprintf "%s/%s_%s", $src_prefix, $db, $v2;
+my $v1 = $ARGV[1]; my $v1_dir = sprintf "%s/%s_%s", $dst_prefix, $db, $v1;
+my $v2 = $ARGV[2]; my $v2_dir = sprintf "%s/%s_%s", $dst_prefix, $db, $v2;
 
-my $delta_dir = sprintf "%s/%s_%s_delta_%s", $dst_prefix, $db, $v1, $v2;
+my $delta_dir = sprintf "%s/%s_%s_delta_%s", $src_prefix, $db, $v1, $v2;
 
-die $! if (! -d $v1_dir);
-die $! if (! -d $delta_dir);
+die "$v1_dir: $!" if (! -d $v1_dir);
+die "$delta_dir: $!" if (! -d $delta_dir);
 
 while (-d $v2_dir) {
     $v2_dir = sprintf "%s.%04d", $v2_dir, int(rand(10000));

misc-scripts/binary_delta/planner.pl

@@ -75,15 +75,15 @@ fi
 
 if [ ! -f deltas/${d}_apply.txt ]; then
   # Apply the delta as a test
-  /usr/bin/time perl -w ./apply.pl -c ./xdelta.osf -s deltas -s databases \\
+  /usr/bin/time perl -w ./apply.pl -c ./xdelta.osf -s deltas -d databases \\
     $db $v0 $v1 2>&1 | \\
      tee deltas/${d}_apply.txt
 fi
 
-  # Remove older revision and new revision built by apply.pl
-  rm -rf databases/$db0
-  rm -rf databases/${db1}.????
-fi
+# Remove older revision and new revision built by apply.pl
+rm -rf databases/$db0
+rm -rf databases/${db1}.????
+
 EOT
     }
     if (defined $pair[1]) {
@@ -93,6 +93,7 @@ if [ -d databases/$db1 ]; then
   # Remove newer (latest) revision
   rm -rf databases/$db1
 fi
+
 EOT
     }
 }