Changeset 4585 for extensions

Timestamp:

Dec 30, 2009, 10:31:40 PM (14 years ago)

Author:

ronosman

Message:

Bug fixed : wrong file name when uploading HD copy of original

File:

• extensions/pLoader/trunk/src/Uploader/ImageList.pm (modified) (15 diffs)

extensions/pLoader/trunk/src/Uploader/ImageList.pm

@@ -220 +220 @@
     # if some files have been previously selected 
     my $i = scalar @{$self->sums};
-printf("SetNewFiles %s\n", $i);
+    #printf("SetNewFiles %s\n", $i);
     my $count = 0;
     $self->count($count);
@@ -329 +329 @@
     my ( $self, $file, $info, $i ) = @_;
     
-printf("_default_photo_name %s\n", $self->default_photo_name);
     
     my $name;
@@ -381 +380 @@
     }
 
-printf("_default_photo_name %s\n", $name);
     $name;
 }
@@ -566 +564 @@
         $resize_h = $resize_w_;
     }
-    printf("resize with blur value %s\n", $self->blur);
+    #printf("resize with blur value %s\n", $self->blur);
     $status = $image->Resize(
         geometry => sprintf("%sx%s>", $resize_w, $resize_h), 
@@ -591 +589 @@
     }
 
-    printf("resize with quality value %s\n", $self->quality);
+    #printf("resize with quality value %s\n", $self->quality);
     $status = $image->Set(quality=>$self->quality);
     warn "$status" if $status ;
@@ -809 +807 @@
         $self-> _set_site_high_file ();
         # photo metadata
+        $self->_upload_selection_prepare() if (!$uploaded->{$self->current_image->file_sum} or $self->reupload_action_files);
         $self->_prepare_upload_properties();            
-        $self->_upload_selection_prepare() if (!$uploaded->{$self->current_image->file_sum} or $self->reupload_action_files);
 
         # transfert resized, high, thumbnail to site
@@ -836 +834 @@
     $self->_set_upload_msg(gettext("Preparing resized image for"));
     $self->_upload_progress();
-
+    #printf("resized %s\n", $self->create_resized);
     if( $self->create_resized ){
         $self->_create_site_resized_file();
@@ -844 +842 @@
     # the original is at the right size, no need to create a resize
     else {
+        #printf("original no resized %s\n", $self->create_resized);
         $self->current_image->site_resized_file(
             $self->current_image->file,
@@ -854 +853 @@
             'Yes, use a copy of the original photo' => 'ORIGINAL',
     };  
-printf("upload HD %s\n", $self->upload_hd);
+    #printf("upload HD %s\n", $self->upload_hd);
         $self->upload_high(
             $decode->{$self->upload_hd}
         );
+    #printf("upload High %s\n", $self->upload_high);
         
     # if upload high, rotate a copy of original file
@@ -1027 +1027 @@
         )
     );
+    #printf("_set_site_resized_file %s\n", $self->current_image->site_resized_file);
 }
 
@@ -1058 +1059 @@
     my ( $self ) = @_;
     # use wx builtin rescale if IM fails
-    printf("CreateResized failed %s. Use ResizeCallback\n", $@);
+    #printf("CreateResized failed %s. Use ResizeCallback\n", $@);
     # use method provided by the caller
     # source, target, type, ratio, width, $height
@@ -1080 +1081 @@
     my ( $self ) = @_;
 
-printf("CreateHigh %s\n", $self->upload_high);
+    #printf("CreateHigh %s\n", $self->upload_high);
     my $bModifyOriginal;
     my $bRotate;
@@ -1125 +1126 @@
         }
         
-        printf("resize with quality value %s\n", $self->quality);
+        #printf("resize with quality value %s\n", $self->quality);
         $status = $image->Set(quality=>$self->quality);
         warn "$status" if $status ;
@@ -1173 +1174 @@
             $self->current_image->file
         );
+        #printf("site high file %s\n", $self->current_image->site_high_file);
     }
 
@@ -1209 +1211 @@
 
     # debug
-    printf("Create watermark %s\n", $file_out);
+    #printf("Create watermark %s\n", $file_out);