OpenACS

gustafn
committed
MAIN:gustafn:20150820172146
on 20 Aug 15
file index.adp was initially added on branch oacs-5-9.
/doc/photo-album-ajaxpa.diff (+5 -5)
48 48 @@ -370,8 +371,9 @@
49 49      if {[regexp {^[0-9]+$} $geometry]} {
50 50          set geometry ${geometry}x${geometry}
51 51      }
52 52 +    if { ![exists_and_not_null package_id] } { set package_id [ad_conn package_id] }
53 53      ns_log debug "pa_make_new_image: Start convert, making $new_image geometry $geometry"
54 54 -    exec [ad_parameter ImageMagickPath]/convert -geometry $geometry -interlace None -sharpen 1x2 $base_image $new_image
55 55 +    exec [parameter::get -parameter ImageMagickPath -package_id $package_id]/convert -geometry $geometry -interlace None -sharpen 1x2 $base_image $new_image
56 56      if {[catch {exec jhead -dt $new_image} errmsg]} {
57 57          ns_log Warning "pa_make_new_image: jhead failed with error - $errmsg"
58 58      }
59 59 @@ -705,15 +707,17 @@
60 60  }     
61 61  
62 62  ad_proc -public  pa_file_info {
63 63 +    {-package_id {}}
64 64      file
65 65  } {
66 66      return the image information from a given file
67 67  } {
68        set info [list]
  68      set info {}
69 69 +    if { ![exists_and_not_null package_id] } { set package_id [ad_conn package_id] }
70 70      if { [catch {set size [file size $file]} errMsg] } {
71 71          return -code error $errMsg
72 72      }
73 73 -    if { [ catch {set out [exec [ad_parameter ImageMagickPath]/identify -format "%w %h %m %k %q %#" $file]} errMsg]} {
74 74 +    if { [ catch {set out [exec [parameter::get -parameter ImageMagickPath -package_id $package_id]/identify -format "%w %h %m %k %q %#" $file]} errMsg]} {
75 75          return -code error $errMsg
76 76      }           
77 77     
78 78 @@ -826,7 +830,7 @@
79 79              set client_filename $upload_name
80 80          }
81 81  
82 82 -        if {[catch {set base_info [pa_file_info $image_file]} errMsg]} {
83 83 +        if {[catch {set base_info [pa_file_info -package_id $package_id $image_file]} errMsg]} {
84 84              ns_log Warning "pa_load_images: error parsing file data $image_file Error: $errMsg"
85 85              error "pa_load_images: error parsing file data $image_file Error: $errMsg"
86 86              continue
87 87 @@ -840,7 +844,7 @@
88 88              set new_image [file join $tmp_path "tmp-[file rootname [file tail $image_file]]"]