r156 - trunk/debian/patches

[Boro Sitnikovski]

Author: bor0-guest
Date: 2012-06-18 22:17:53 +0000 (Mon, 18 Jun 2012)
New Revision: 156

Added:
   trunk/debian/patches/37_bins_thumbnails
Log:
bugfixes for 402458 and 196310

Added: trunk/debian/patches/37_bins_thumbnails
===================================================================
--- trunk/debian/patches/37_bins_thumbnails	                        (rev 0)
+++ trunk/debian/patches/37_bins_thumbnails	2012-06-18 22:17:53 UTC (rev 156)
@@ -0,0 +1,69 @@
+Author: Boro Sitnikovski <buritomath at yahoo.com>
+Description: thumbnails in independent directory
+Bug-Debian: http://bugs.debian.org/196310
+
+--- /a/bins	2012-06-19 00:14:28.869285984 +0200
++++ /b/bins.original	2012-06-18 18:18:05.794798841 +0200
+@@ -1145,26 +1145,6 @@
+         my $albumdir2 = File::Spec->rel2abs(".");
+         chdir($pwd);
+ 
+-        if (! -d "$albumdir\/thumbs") {
+-            mkdir "$albumdir\/thumbs", 0755
+-                or die("\nCannot create $albumdir\/thumbs: $?");
+-        }
+-
+-        if (! -d "$albumdir\/thumbs\/Lg") {
+-            mkdir "$albumdir\/thumbs\/Lg", 0755
+-                or die("\nCannot create $albumdir\/thumbs\/Lg: $?");
+-        }
+-
+-        if (! -d "$albumdir\/thumbs\/Med") {
+-            mkdir "$albumdir\/thumbs\/Med", 0755
+-                or die("\nCannot create $albumdir\/thumbs\/Med: $?");
+-        }
+-
+-        if (! -d "$albumdir\/thumbs\/Sm") {
+-            mkdir "$albumdir\/thumbs\/Sm", 0755
+-                or die("\nCannot create $albumdir\/thumbs\/Sm: $?");
+-        }
+-
+         #print "picdir:   $picdir2\n";
+         #print "albumdir: $albumdir2\n";
+ 
+@@ -3247,7 +3227,7 @@
+         $imageData[$i]{'height'} = $height;
+ 
+         #generate thumbnail (with dir if needed)
+-        my $thumbName = "thumbs\/$crntImageBase"."_pre.jpg";
++        my $thumbName = "$crntImageBase"."_pre.jpg";
+         #$imageData[$i]{'thumblink'} = &getWebBase($album).$thumbName;
+         $imageData[$i]{'thumblink'} = jssafe_uri_escape($thumbName);
+ 
+@@ -3273,7 +3253,7 @@
+             if (! $filling_in_sizes ) {
+                 my $size = $imageConfigHash->{sizeNames}[$j];
+                 $size =~ s/\.//g ;
+-                $scaledImage = "thumbs\/".$size."\/".$crntImageBase."_".
++                $scaledImage = $crntImageBase."_".
+                     $size.".jpg";
+                 $maxWidth = $imageConfigHash->{scaledWidths}[$j];
+                 $maxHeight = $imageConfigHash->{scaledHeights}[$j];
+@@ -3390,7 +3370,7 @@
+                                      $nextImageNum);
+ 
+             $imageData[$i]{$j}{'preloadIMG'} =
+-                "thumbs\/".$size."\/".jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
++                jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
+                 $imageData[$nextImageNum]{configuration}{sizeNames}[$sizeLink].
+                 ".jpg";
+             $imageData[$i]{$j}{'imgNum'} = $i + 1;
+@@ -3428,7 +3408,7 @@
+                 #$imageData[$i]{$j}{'sizedFile'} =
+                 #  &getWebBase($album).$imageData[$i]{'imagepath'}.
+                 #    $scaledImage;
+-                $imageData[$i]{$j}{'sizedFile'} = "thumbs\/".$size."\/".$scaledImage;
++                $imageData[$i]{$j}{'sizedFile'} = $scaledImage;
+             }
+         }
+