X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=d73df38a381788ff31b090f708d43f5b20f9d566;hb=42d4fc8288f205794e964cacb04871ef04f01043;hp=024d220f4628dd39df35a4deeb8cd5d2b3efd8a6;hpb=6aab2b85ef880b18dc8f1a575d477f942db7c58b;p=pr0n

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 024d220..d73df38 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -24,6 +24,7 @@ use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
 use HTML::Entities;
+use URI::Escape;
 
 BEGIN {
 	use Exporter ();
@@ -129,6 +130,12 @@ sub get_query_string {
 	while (my ($key, $value) = each %$param) {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+		$value = URI::Escape::uri_escape($value);
+
+		# Unescape a few for prettiness (we'll need something for a real _, though)
+		$value =~ s/%20/_/g;
+		$value =~ s/%2F/\//g;
 	
 		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
@@ -209,7 +216,7 @@ sub update_image_info {
 			undef, $id)
 			or die "Couldn't delete old EXIF information in SQL: $!";
 
-		my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
+		my $q = $dbh->prepare('INSERT INTO exif_info (image,key,value) VALUES (?,?,?)')
 			or die "Couldn't prepare inserting EXIF information: $!";
 
 		for my $key (keys %$info) {
@@ -404,7 +411,7 @@ sub ensure_cached {
 				    	$parms{'interlace'} = 'Plane';
 				}
 				if (defined($sf)) {
-					$parms{'scaling-factor'} = $sf;
+					$parms{'sampling-factor'} = $sf;
 				}
 				$err = $cimg->write(%parms);
 			}