On Sun, 1 Sep 2002, Klavs Klavsen wrote:
> Nobody knows what changes occured from v1.8.6 to v1.8.7?
A quick diff shows that it is only small changes - mostly related to
Apache 2.0.
The full diff is attached.
- Jonas
--
Jonas Smedegaard (+45 40843136) http://dr.jones.dk/~jonas/
Spiff ApS (= IT-guide dr. Jones ApS) http://dr.jones.dk/
Debian GNU/Linux developer http://people.debian.org/~js/
diff -ruN sql-ledger.old/bin/lynx/ic.pl sql-ledger/bin/lynx/ic.pl
--- sql-ledger.old/bin/lynx/ic.pl 2002-08-12 05:02:18.000000000 +0200
+++ sql-ledger/bin/lynx/ic.pl 2002-08-27 21:47:50.000000000 +0200
@@ -1048,14 +1048,18 @@
map { $newform{$_} = $form->{$_} } keys %$form;
$previous_form = $form->unescape($form->{previous_form});
+ $previous_form =~ s/%26/&/g; # moved up here for 2.0
# don't trample on previous variables
map { delete $form->{$_} } keys %newform;
# now take it apart and restore original values
foreach $item (split /&/, $previous_form) {
+ $item = $form->unescape($item); # added for Apache 2.0
($key, $value) = split /=/, $item, 2;
- $value =~ s/%26/&/g;
+ $key = $form->unescape($key); # added for Apache 2.0
+ $value = $form->unescape($value); # added for Apache 2.0
+# $value =~ s/%26/&/g;
$form->{$key} = $value;
}
@@ -1105,7 +1109,8 @@
# put callback together
foreach $key (sort keys %$form) {
- $value = $form->escape($form->{$key});
+ # do single escape for Apache 2.0
+ $value = $form->escape($form->{$key}, 1);
$callback .= qq|&$key=$value|;
}
$form->{callback} = $callback;
diff -ruN sql-ledger.old/bin/mozilla/ic.pl sql-ledger/bin/mozilla/ic.pl
--- sql-ledger.old/bin/mozilla/ic.pl 2002-08-12 05:02:18.000000000 +0200
+++ sql-ledger/bin/mozilla/ic.pl 2002-08-27 21:47:50.000000000 +0200
@@ -1048,14 +1048,18 @@
map { $newform{$_} = $form->{$_} } keys %$form;
$previous_form = $form->unescape($form->{previous_form});
+ $previous_form =~ s/%26/&/g; # moved up here for 2.0
# don't trample on previous variables
map { delete $form->{$_} } keys %newform;
# now take it apart and restore original values
foreach $item (split /&/, $previous_form) {
+ $item = $form->unescape($item); # added for Apache 2.0
($key, $value) = split /=/, $item, 2;
- $value =~ s/%26/&/g;
+ $key = $form->unescape($key); # added for Apache 2.0
+ $value = $form->unescape($value); # added for Apache 2.0
+# $value =~ s/%26/&/g;
$form->{$key} = $value;
}
@@ -1105,7 +1109,8 @@
# put callback together
foreach $key (sort keys %$form) {
- $value = $form->escape($form->{$key});
+ # do single escape for Apache 2.0
+ $value = $form->escape($form->{$key}, 1);
$callback .= qq|&$key=$value|;
}
$form->{callback} = $callback;
diff -ruN sql-ledger.old/doc/UPGRADE-1.8.5-1.8.6 sql-ledger/doc/UPGRADE-1.8.5-1.8.6
--- sql-ledger.old/doc/UPGRADE-1.8.5-1.8.6 2002-08-23 06:06:26.000000000 +0200
+++ sql-ledger/doc/UPGRADE-1.8.5-1.8.6 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-Upgrading from version 1.8.5 to 1.8.6
-
-1. install SQL-Ledger over top of your old installation
- $ cd /usr/local
- $ tar zxvf sql-ledger-1.8.6.tar.gz
-
diff -ruN sql-ledger.old/doc/UPGRADE-1.8.5-1.8.7 sql-ledger/doc/UPGRADE-1.8.5-1.8.7
--- sql-ledger.old/doc/UPGRADE-1.8.5-1.8.7 1970-01-01 01:00:00.000000000 +0100
+++ sql-ledger/doc/UPGRADE-1.8.5-1.8.7 2002-08-26 18:19:05.000000000 +0200
@@ -0,0 +1,6 @@
+Upgrading from version 1.8.5 to 1.8.7
+
+1. install SQL-Ledger over top of your old installation
+ $ cd /usr/local
+ $ tar zxvf sql-ledger-1.8.7.tar.gz
+
diff -ruN sql-ledger.old/SL/Form.pm sql-ledger/SL/Form.pm
--- sql-ledger.old/SL/Form.pm 2002-08-23 01:59:56.000000000 +0200
+++ sql-ledger/SL/Form.pm 2002-08-26 17:46:56.000000000 +0200
@@ -55,7 +55,7 @@
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,)/_/g;
- $self->{version} = "1.8.6";
+ $self->{version} = "1.8.7";
$self->{dbversion} = "1.8.5";
bless $self, $type;
diff -ruN sql-ledger.old/SL/IC.pm sql-ledger/SL/IC.pm
--- sql-ledger.old/SL/IC.pm 2002-08-23 18:38:06.000000000 +0200
+++ sql-ledger/SL/IC.pm 2002-08-24 18:36:44.000000000 +0200
@@ -545,7 +545,7 @@
$where .= " AND p.assembly = '1'";
}
if ($form->{searchitems} eq 'services') {
- $where .= " AND p.inventory_accno_id = NULL AND NOT assembly = '1'";
+ $where .= " AND p.inventory_accno_id IS NULL AND NOT assembly = '1'";
# irrelevant for services
$form->{make} = $form->{model} = "";
}
diff -ruN sql-ledger.old/SL/IS.pm sql-ledger/SL/IS.pm
--- sql-ledger.old/SL/IS.pm 2002-08-08 19:48:02.000000000 +0200
+++ sql-ledger/SL/IS.pm 2002-08-26 17:17:31.000000000 +0200
@@ -132,6 +132,7 @@
}
$form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+ $tax = 0 if $form->{taxincluded};
$form->{invtotal} = $form->{total} + $tax;
$form->{total} = $form->format_amount($myconfig, $form->{invtotal} - $form->{paid},
2, "-");
$form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2, "-");
diff -ruN sql-ledger.old/SL/OE.pm sql-ledger/SL/OE.pm
--- sql-ledger.old/SL/OE.pm 2002-08-23 23:01:11.000000000 +0200
+++ sql-ledger/SL/OE.pm 2002-08-26 17:21:00.000000000 +0200
@@ -505,7 +505,7 @@
}
}
-
+ $tax = 0 if $form->{taxincluded};
$form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
$form->{ordtotal} += $tax;
diff -ruN sql-ledger.old/VERSION sql-ledger/VERSION
--- sql-ledger.old/VERSION 2002-08-23 02:00:10.000000000 +0200
+++ sql-ledger/VERSION 2002-08-26 17:47:18.000000000 +0200
@@ -1 +1 @@
-1.8.6
+1.8.7
