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 -r1.4 -r1.5
--- openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	15 Dec 2006 22:28:43 -0000	1.4
+++ openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	16 Dec 2006 18:41:02 -0000	1.5
@@ -6,13 +6,13 @@
 
 ad_proc -callback application-track::getApplicationName -impl album {} { 
         callback implementation 
-    } {
+} {
         return "album"
-    }    
+}    
       
 ad_proc -callback application-track::getGeneralInfo -impl album {} { 
         callback implementation 
-    } {
+} {
 	db_1row my_query {
 		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
@@ -33,12 +33,12 @@
 	} 
 	
 	return "$result"
-    } 
+} 
 
                             
 ad_proc -callback application-track::getSpecificInfo -impl album {} { 
         callback implementation 
-    } {
+} {
    	
 	upvar $query_name my_query
 	upvar $elements_name my_elements
@@ -70,35 +70,34 @@
 	            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	                        
 	 	    html {align center}	 	                
-	        }
-	        p_story {
-	            label "Story"
-	            display_col story	                        
+		}
+		p_story {
+			label "Story"
+			display_col story	                        
 	 	    html {align center}	 	                
-	        }
-	        p_photographer {
-	            label "Photographer"
-	            display_col photographer	                        
+		}
+		p_photographer {
+			label "Photographer"
+			display_col photographer	                        
 	 	    html {align center}	 	                
-	        }
+		}
 	          
 	        
 	}
 
-<<<<<<< photo-album-callback-procs.tcl
-        return "OK"
-    }
-=======
+	return "OK"
+}
+
 ad_proc -callback merge::MergePackageUser -impl photo_album {
     -from_user_id:required
     -to_user_id:required
@@ -116,87 +115,3 @@
     return $result
 }
 
-#Callbacks for application-track
-
-ad_proc -callback application-track::getApplicationName -impl album {} { 
-        callback implementation 
-    } {
-        return "album"
-    }    
-      
-ad_proc -callback application-track::getGeneralInfo -impl album {} { 
-        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		
-	
-	} 
-	
-	return "$result"
-    } 
-
-                            
-ad_proc -callback application-track::getSpecificInfo -impl album {} { 
-        callback implementation 
-    } {
-   	
-	upvar $query_name my_query
-	upvar $elements_name my_elements
-
-	set my_query {
-	
-		select distinct p.user_filename as name,p.pa_photo_id as id,p.story as story,p1.photographer as photographer, ac3.title as name_album
-			from pa_photos p,pa_albums p1, dotlrn_communities com,acs_objects ac,acs_objects ac2,acs_objects ac1,acs_objects ac3
-		    		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 p1.pa_album_id = ac3.object_id
-                    and ac3.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)
-		    		
-				
-	}
-	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	                        
-	 	    html {align center}	 	                
-	        }
-	        p_story {
-	            label "Story"
-	            display_col story	                        
-	 	    html {align center}	 	                
-	        }
-	        p_photographer {
-	            label "Photographer"
-	            display_col photographer	                        
-	 	    html {align center}	 	                
-	        }
-	          
-	        
-	}
-
-        return "OK"
-    }>>>>>>> 1.1.2.4