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.1.2.2 -r1.1.2.3
--- openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	25 Nov 2005 11:49:57 -0000	1.1.2.2
+++ openacs-4/packages/photo-album/tcl/photo-album-callback-procs.tcl	20 Nov 2006 20:00:30 -0000	1.1.2.3
@@ -1,8 +1,5 @@
 # /packages/photo-album/tcl/photo-album-callbacks-procs.tcl
 ad_library {
-<<<<<<< photo-album-callback-procs.tcl
-    Library of callbacks implementations for photo-album
-=======
     TCL library for the photo-album callbacks implementations
 
     @author Enrique Catalan (quio@galileo.edu)
@@ -39,88 +36,88 @@
     } 
     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"
+
+#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"
     }
\ No newline at end of file