Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-admin/www/apm/version-files.tcl	18 Sep 2002 14:54:45 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-files.tcl	5 Mar 2003 14:43:12 -0000	1.7.2.1
@@ -1,33 +1,19 @@
 ad_page_contract { 
     List all the files in a particular version of a package.
 
-    @param version_id The package to be processed.
-    @param remove_files_p Set to 1 if you want to remove all the files. 
     @author Jon Salz [jsalz@arsdigita.com]
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
     {version_id:integer}
-    {remove_files_p 0}
 }
 
-db_1row apm_package_by_version_id {
-	select pretty_name, version_name, package_key, installed_p, distribution_uri,
-	tagged_p
-	from apm_package_version_info where version_id = :version_id
-}
+apm_version_info $version_id
 
-if { $remove_files_p == 1 } {
-    # This is really a "remove multiple files" page.
-    set form "action=\"file-remove\" method=post"
-    set apm_header_args [list [list "version-files?version_id=$version_id" "Files"] "Remove Files"]
-} else {
-    set form ""
-    set apm_header_args [list "Files"]
-}
+set form ""
+set apm_header_args [list "Files"]
 
-doc_body_append "[eval [concat [list apm_header -form $form [list "version-view?version_id=$version_id" "$pretty_name $version_name"]] $apm_header_args]]
-"
+doc_body_append "[eval [concat [list apm_header -form $form [list "version-view?version_id=$version_id" "$pretty_name $version_name"]] $apm_header_args]]"
 
 doc_body_append "
 
@@ -40,17 +26,18 @@
 set counter 0
 
 doc_body_append "<tr><th align=left>Path</th><th width=40></th><th align=left>File type</th><th width=40></th>
-                 <th align=left>Database support</th><th width=40></th><th align=left>Actions</th></tr>\n"
+                 <th align=left>Database support</th><th width=40></th></tr>\n"
 
-db_foreach apm_all_files {
-    select f.file_id, f.path, f.file_type, nvl(t.pretty_name, 'Unknown type') file_pretty_name,
-           f.db_type, nvl(d.pretty_db_name, 'All') as db_pretty_name
-    from   apm_package_files f, apm_package_file_types t, apm_package_db_types d
-    where  f.version_id = :version_id
-    and    f.file_type = t.file_type_key(+)
-    and    f.db_type = d.db_type_key(+)
-    order by path
-} {
+foreach path [apm_get_package_files -package_key $package_key] {
+    set file_id ""
+    set db_type [apm_guess_db_type $package_key $path]
+    set db_pretty_name $db_type
+    set file_type [apm_guess_file_type $package_key $path]
+    if { [empty_string_p $file_type] } {
+        set file_type "?"
+    }
+    set file_pretty_name $file_type
+
     incr counter
 
     # Set i to the index of the last component which hasn't changed since the last component
@@ -86,10 +73,7 @@
 	    doc_body_append "</td>"
 	    doc_body_append "<td width=40>&nbsp;</td><td>$file_pretty_name</td><td width=40>&nbsp</td><td>$db_pretty_name</td>
                              <td width=40>&nbsp;</td>"
-	    if { $remove_files_p == 1 } {
-		# Display a checkbox which the user can check to delete the file.
-		doc_body_append "<td><input type=checkbox name=file_id value=$file_id></td>"
-	    } else {
+
 		if { $installed_p == "t" } {
 		    if { $file_type == "tcl_procs" || ($file_type == "query_file" && [db_compatible_rdbms_p $db_type]) } {
 			if { [nsv_exists apm_reload_watch "packages/$package_key/$path"] } {
@@ -99,77 +83,56 @@
 			    if {![ad_parameter -package_id [ad_acs_kernel_id] \
 				    PerformanceModeP request-processor 1]} {
 				# Provide a link to watch the procs file.
-				doc_body_append "<td>&nbsp;<a href=\"file-watch?file_id=$file_id\">watch</a>&nbsp;</td>"
+				doc_body_append "<td>&nbsp;<a href=\"file-watch?version_id=$version_id&paths=$path\">watch</a>&nbsp;</td>"
 			    } else {
 				doc_body_append "<td></td>"
 			    }
 			}
 		    } else {
 			doc_body_append "<td></td>"
 		    }
-		}
-		# Allow the user to remove the file from the package.
-		doc_body_append "<td><a href=\"javascript:if(confirm('Are you sure you want to remove this file from the package?\\nDoing so will not remove it from the filesystem.'))location.href='file-remove?[export_url_vars version_id file_id]'\">remove</a></td>"
-	    }		
+
+                }
 	}
 	doc_body_append "</tr>\n"
 	incr i
     }
     set last_components $components
-} else {
+} 
+
+if { [string equal $counter 0] } {
     doc_body_append "<tr><td>This package does not contain any registered files.</td></tr>\n"
 }
 
-if { $counter > 0 && $remove_files_p == 1 } {
-    doc_body_append "<tr><td colspan=3></td><td colspan=2>
-[export_form_vars version_id]
-<input type=button value=\"Remove Checked Files\" onClick=\"javascript:if(confirm('Are you sure you want to remove these files from the package?\\nDoing so will not remove them from the filesystem.'))form.submit()\"></td>"
-}
-
-doc_body_append "
-</table>
+doc_body_append "</table>
 </blockquote>
 "
 
-if { $remove_files_p } {
-    doc_body_append "<ul><li><a href=\"version-files?version_id=$version_id\">Cancel the removal of files</a></ul>\n"
-} else {
-    if { $installed_p == "t" } {
-	doc_body_append "<ul>
-<li><a href=\"file-add?version_id=$version_id\">Scan the <tt>packages/$package_key</tt> directory for additional files in this package</a>
-<li><a href=\"version-files?version_id=$version_id&remove_files_p=1\">Remove several files from this package</a>
-"
+if { $installed_p == "t" } {
+    doc_body_append "<ul>
+    <li><a href=\"package-watch?package_key=$package_key\">watch all files</a></li>"
 
-        if { [info exists stricken_files] } {
-	    foreach file_id $stricken_files {
-		lappend stricken_file_query "file_id=$file_id"
-	    }
-	    doc_body_append "<li><a href=\"file-remove?[export_url_vars version_id]&[join $stricken_file_query "&"]\">Remove nonexistent (crossed-out) files</a>\n"
-	}
+    if { [empty_string_p $distribution_uri] } {
+        doc_body_append "
+    <p>
+    <!--li><a href=\"version-tag?version_id=$version_id\">Create a CVS tag for this version in each file</a-->"
 
-        if { [empty_string_p $distribution_uri] } {
-	    doc_body_append "
-	<p>
-	<!--li><a href=\"version-tag?version_id=$version_id\">Create a CVS tag for this version in each file</a-->
-"
-        }
+    }
 
-	if {$tagged_p == "t"} {
-	    doc_body_append "
-	    <li><a href=\"archive/[file tail $version_uri]?version_id=$version_id\">Download a tarball from the package archive</a>"
-	}
+    if {$tagged_p == "t"} {
+        doc_body_append "
+        <li><a href=\"archive/[file tail $version_uri]?version_id=$version_id\">Download a tarball from the package archive</a>"
+    }
 
-	doc_body_append "</ul>"
+    doc_body_append "</ul>"
 
-    } elseif { [info exists tagged_p] } {
-	if { $tagged_p == "t" } {
-	    doc_body_append "<ul>
-	    <li><a href=\"archive/[file tail $version_uri]?version_id=$version_id\">Download a tarball from the package archive</a>
-	    </ul>
-	    "
-	}
+} elseif { [info exists tagged_p] } {
+    if { $tagged_p == "t" } {
+        doc_body_append "<ul>
+        <li><a href=\"archive/[file tail $version_uri]?version_id=$version_id\">Download a tarball from the package archive</a>
+        </ul>
+        "
     }
 }
 
 doc_body_append [ad_footer]
-