Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	19 Dec 2002 16:06:59 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	25 Feb 2003 16:57:20 -0000	1.6
@@ -21,7 +21,6 @@
 "
 
 set sql_file_list [list]
-set catalog_file_list [list]
 set file_count 0
 
 foreach pkg_info $pkg_install_list {
@@ -47,8 +46,10 @@
     # Find out which script is appropriate to be run.
     set data_model_in_package 0
     set table_rows ""
-    set data_model_files [apm_data_model_scripts_find -upgrade_from_version_name \
-	    $initial_version_name -upgrade_to_version_name $final_version_name $package_key $version(files)]
+    set data_model_files [apm_data_model_scripts_find \
+                              -upgrade_from_version_name $initial_version_name \
+                              -upgrade_to_version_name $final_version_name \
+                              $package_key]
     set sql_file_list [concat $sql_file_list $data_model_files]
     if {![empty_string_p $data_model_files]} {
 	foreach file $data_model_files {
@@ -62,6 +63,12 @@
   </tr>"
 	    incr file_count
 	}
+
+        if { [empty_string_p $version(auto-mount)] && [string equal $version(package.type) apm_application] } {
+            set mount_html "<input type=\"checkbox\" name=\"mount_p\" value=\"$version(package.key)\" /> Mount package under the main site at path <input type=\"text\" name=\"mount_path.$version(package.key)\" value=\"$version(package.key)\" />"
+        } else {
+            set mount_html ""
+        }
 	append body "
 	Select what data files to load for $version(package-name) $final_version_name
 	<blockquote>
@@ -72,17 +79,14 @@
 	    <th>File Name</th>
           </tr>
 	$table_rows
-	</table></blockquote> <p>"
+	</table>
+        $mount_html
+       </blockquote> <p>"
     }
-
-    # I18N: Get the list of message catalog files to source
-    set catalog_file_list [concat $catalog_file_list [apm_message_catalog_files_find $package_key $version(files)]]
 }
 
 ad_set_client_property -clob t apm sql_file_paths $sql_file_list
 
-ad_set_client_property -clob t apm catalog_file_paths $catalog_file_list
-
 if {[empty_string_p $sql_file_list]} {
     ad_returnredirect packages-install-4
     ad_script_abort