Mercurial > bins
annotate debian/patches/22_bins-hash-ref @ 6:3021deef1599
Encoding related fixes
* chomp encoding string
* reformat else (seems someone hacked it in)
* debug print encoding
* do not use :utf8 binmode ("re-encode") on written file if the input is _already_ UTF-8
author | Peter Gervai <grin@grin.hu> |
---|---|
date | Thu, 16 Oct 2008 00:02:14 +0200 |
parents | c5749e43b1d7 |
children |
rev | line source |
---|---|
4
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
1 #! /bin/sh /usr/share/dpatch/dpatch-run |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
2 ## 22_hash_ref.dpatch by <rousseau@imac.maison.bogus> |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
3 ## |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
4 ## All lines beginning with `## DP:' are a description of the patch. |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
5 ## DP: Closes: #481662 bins: Crashes mid-album |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
6 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
7 @DPATCH@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
8 --- bins-1.1.29.orig/bins |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
9 +++ bins-1.1.29/bins |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
10 @@ -3750,8 +3750,8 @@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
11 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
12 my @descTable; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
13 foreach my $tagName (@mainFields) { |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
14 - if (${%$hashref}{$tagName}) { |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
15 - my $value=${%$hashref}{$tagName}; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
16 + if (${$hashref}{$tagName}) { |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
17 + my $value=${$hashref}{$tagName}; |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
18 $value =~ s/'/'/g ; # in case it's used in javascript code |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
19 push @descTable, {DESC_FIELD_NAME => $fields{$tagName}->{'Name'}, |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
20 DESC_FIELD_VALUE => $value, |