Index: openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	10 Nov 2005 14:02:35 -0000	1.2
+++ openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	25 May 2006 13:05:53 -0000	1.3
@@ -15,12 +15,21 @@
         callback implementation 
     } {
 	db_1row my_query {
-	select count(p.pa_album_id) as result
-			from pa_albums p, cr_items cr,acs_objects a,dotlrn_communities_all d
-		    	where  d.community_id = :comm_id
-		    	and cr.live_revision = p.pa_album_id		    	
-			  and a.object_id = cr.parent_id
-			  and apm_package__parent_id(a.context_id) = d.package_id		
+		select  count(distinct p.pa_photo_id) as result
+			from acs_objects ac,acs_objects ac2,acs_objects ac1,acs_objects ac3,dotlrn_communities_all d,pa_albums p1,pa_photos p
+			where p1.pa_album_id = ac.object_id
+			and ac.context_id = ac1.object_id
+			and ac1.context_id = ac2.object_id
+			and ac2.context_id = ac3.object_id
+			and ac3.context_id = d.package_id
+			and d.community_id = :comm_id
+			and p1.pa_album_id IN
+			(select distinct p2.pa_album_id
+			from pa_albums p2,cr_revisions c,cr_revisions c2, cr_items c1
+		    		where p.pa_photo_id = c.revision_id
+		    		and c.item_id = c1.item_id
+		    		and c2.revision_id = p2.pa_album_id
+		    		and c2.item_id = c1.parent_id)	
 	
 	} 
 	
@@ -37,22 +46,37 @@
 
 	set my_query {
 	
-		select p.pa_photo_id as id,p.story as story,p.photographer as photographer
-			from pa_photos p, dotlrn_communities com,acs_objects ac,acs_objects ac2,acs_objects ac1
-		    		where com.community_id=:class_instance_id	    	
-		    		and ac.object_id = p.pa_photo_id
-		    		and ac.context_id = ac1.object_id
-		    		and ac1.context_id = ac2.object_id				
-				and ac2.context_id
-					IN	(select ac1.context_id
-				from pa_albums p, dotlrn_communities com,acs_objects ac,acs_objects ac1
-		    		where com.community_id=:class_instance_id	    	
-		    		and ac.object_id = p.pa_album_id
-		    		and ac.context_id = ac1.object_id
-		    		)
+		
+		select distinct ac.title as name_album,p.user_filename as name,p.pa_photo_id as id,p.story as story,p1.photographer as photographer
+			from acs_objects ac,acs_objects ac2,acs_objects ac1,acs_objects ac3,dotlrn_communities_all d,pa_albums p1,pa_photos p
+			where p1.pa_album_id = ac.object_id
+			and ac.context_id = ac1.object_id
+			and ac1.context_id = ac2.object_id
+			and ac2.context_id = ac3.object_id
+			and ac3.context_id = d.package_id
+			and d.community_id = :class_instance_id
+			and p1.pa_album_id IN
+			(select distinct p2.pa_album_id
+			from pa_albums p2,cr_revisions c,cr_revisions c2, cr_items c1
+		    		where p.pa_photo_id = c.revision_id
+		    		and c.item_id = c1.item_id
+		    		and c2.revision_id = p2.pa_album_id
+		    		and c2.item_id = c1.parent_id)
+		    		
 				
 	}
 	set my_elements {
+	
+		album_name {
+	            label "Album Name"
+	            display_col name_album	                        
+	 	    html {align center}	 	                
+	        }
+		photo_name {
+	            label "Photo name"
+	            display_col name	                        
+	 	    html {align center}	 	                
+	        }
 		photo_id {
 	            label "Photo_id"
 	            display_col id	                        
@@ -64,10 +88,11 @@
 	 	    html {align center}	 	                
 	        }
 	        p_photographer {
-	            label "photographer"
+	            label "Photographer"
 	            display_col photographer	                        
 	 	    html {align center}	 	                
 	        }
+	          
 	        
 	}