Index: openacs-4/packages/photo-album/tcl/photo-album-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	1 Nov 2003 08:45:39 -0000	1.6
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	18 Nov 2003 18:55:29 -0000	1.7
@@ -581,11 +581,11 @@
     # append the 'prev' link
     append photo_nav_html "<div class=\"photo_album_nav\">\n"
     if { ![empty_string_p $prev_id] } {
-	append photo_nav_html "\t<div style=\"text-align: left; float: left; margin-right: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$prev_id\">&lt;&lt;&nbsp;Prev$what</a>\n\t</div>\n"
+	append photo_nav_html "\t<div style=\"text-align: left; float: left; margin-right: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$prev_id\">&lt;&lt;&nbsp;[_ photo-album.Prev]$what</a>\n\t</div>\n"
     }
     # append the 'next' link
     if { ![empty_string_p $next_id] } {
-	append photo_nav_html "\t<div style=\"text-align: right; float: right; margin-left: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$next_id\">Next$what&nbsp;&gt;&gt;</a>\n\t</div>\n"
+	append photo_nav_html "\t<div style=\"text-align: right; float: right; margin-left: 1em; margin-bottom: 1em\">\n\t\t<a href=\"${link}$next_id\">[_ photo-album.Netx]$what&nbsp;&gt;&gt;</a>\n\t</div>\n"
     }
 
     # append page number links for all pages except for this page
@@ -785,6 +785,7 @@
     {-description {}}
     {-story {}}
     {-caption {}}
+    {-feedback_mode 0}
     image_files 
     album_id 
     user_id
@@ -795,6 +796,7 @@
     -client_name provide the name of the upload file (for individual uploads)
     -strip_prefix the prefix to remove from the filename (for expanded archives)
     image_files list of files to process
+    -feedback_mode to provide much info of the loading process on a bulk upload
 } { 
     set new_ids [list]
     set peeraddr [ad_conn peeraddr]
@@ -957,6 +959,38 @@
                 db_dml update_photo_data {}
             }
 
+	    if $feedback_mode {
+		ns_write "
+                          <ul>
+                            <li>Loading image <b>$client_filename</b></li>
+                             <ul>
+                               <li>General information:</li>
+                                 <ul>
+                                   <li>Base Name: $base_image_name</li>
+                                   <li>Photo_id: $photo_id</li>
+                                   <li>Width: $base_width</li>
+                                   <li>Height: $base_height</li>
+                                   <li>Size: $base_bytes bytes</li>
+                                   <li>Base image name: $base_image_name</li>
+                                 </ul>
+                               <li>Thumbnail information:</li>
+                                 <ul>
+                                   <li>Thumnail name: $th_image_name</li>
+                                   <li>Width: $thumb_width</li>
+                                   <li>Height: $thumb_height</li>
+                                   <li>Size: $thumb_bytes bytes</li>
+                                 </ul>
+                               <li>Photo view information:</li>
+                                 <ul>
+                                   <li>View name: $vw_image_name</li>
+                                   <li>Width: $viewer_width</li>
+                                   <li>Height: $viewer_height</li>
+                                   <li>Size: $viewer_bytes bytes</li>
+                                 </ul>
+                             </ul>
+                          </ul>"
+	    }
+
             pa_insert_image $base_image_name $photo_id $base_item_id $base_rev_id $user_id $peeraddr $photo_id $base_image_name "original image" $base_mime "base" "t" $base_filename_relative $base_height $base_width $base_bytes 
             pa_insert_image $th_image_name $photo_id $thumb_item_id $thumb_rev_id $user_id $peeraddr $photo_id $th_image_name "thumbnail" $thumb_mime "thumb" "t" $thumb_filename_relative $thumb_height $thumb_width $thumb_bytes 
             pa_insert_image $vw_image_name $photo_id $viewer_item_id $viewer_rev_id $user_id $peeraddr $photo_id $vw_image_name "web image" $viewer_mime "viewer" "t" $viewer_filename_relative $viewer_height $viewer_width $viewer_bytes 
Index: openacs-4/packages/photo-album/tcl/photo-album-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/photo-album/tcl/photo-album-procs.xql	12 Jun 2003 06:55:45 -0000	1.2
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.xql	18 Nov 2003 18:55:29 -0000	1.3
@@ -14,7 +14,7 @@
   ci.item_id
 from cr_items ci,
   cr_child_rels ccr
-where ci.live_revision is not null
+where ci.latest_revision is not null
   and ci.content_type = 'pa_photo'
   and ccr.parent_id = :album_id
   and ci.item_id = ccr.child_id