Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/packages-install-2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.8.4.1 -r1.8.4.2
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	20 Apr 2005 11:29:30 -0000	1.8.4.1
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	16 Aug 2005 14:56:49 -0000	1.8.4.2
@@ -10,7 +10,7 @@
     {enable:multiple ""}
     {force_p "f"}
 }
-
+set page_content ""
 # Install and enable are sets of keys; need to turn them back into spec files.
 set spec_files [ad_get_client_property apm spec_files]
 
@@ -45,7 +45,7 @@
 }
 
 if {![info exists install_spec_files]} {
-    doc_body_append "[apm_header "Package Installation"]<p>
+    append page_content "[apm_header "Package Installation"]<p>
 No packages selected.<p>[ad_footer]"
     return
 }
@@ -59,7 +59,7 @@
 
     # Check was good after adding a couple more packages
 
-    doc_body_append "[apm_header "Package Installation"]
+    append page_content "[apm_header "Package Installation"]
     <h2>Additional Packages Automatically Added</h2><p>
     
     Some of the packages you were trying to install required other packages to be installed first.
@@ -75,9 +75,9 @@
     set install [concat $install $extra_package_keys]
     set enable [concat $enable $extra_package_keys]
     
-    doc_body_append [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
+    append page_content [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
 
-    doc_body_append "
+    append page_content "
     </table></blockquote>
     <input type=submit value=\"Select Data Model Scripts\">
     </form>
@@ -95,7 +95,7 @@
     ad_script_abort
 } else {
     ### Check failed.  Offer user an explanation and an ability to select unselect packages.
-    doc_body_append "[apm_header "Package Installation"]
+    append page_content "[apm_header "Package Installation"]
     <h2>Select Packages to Install</h2><p>
     
     Some of the packages you are trying to install have unsatisfied dependencies.  The packages
@@ -117,10 +117,10 @@
     <table>
     "
     
-    doc_body_append [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
+    append page_content [apm_package_selection_widget [lindex $dependency_results 1] $install $enable]
 
     
-    doc_body_append "
+    append page_content "
     </table></blockquote>
     <input type=checkbox name=force_p value=\"t\"> <strong>Force the install<p></strong>
     <input type=submit value=\"Select Data Model Scripts\">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/packages-install-3.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.11 -r1.11.4.1
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	7 Oct 2003 14:52:49 -0000	1.11
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	16 Aug 2005 14:56:49 -0000	1.11.4.1
@@ -100,5 +100,3 @@
 </form>
 [ad_footer]
 "
-
-doc_return 200 text/html $body
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/apm/packages-install.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.18 -r1.18.4.1
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	26 Sep 2003 07:50:33 -0000	1.18
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	16 Aug 2005 14:56:49 -0000	1.18.4.1
@@ -9,7 +9,7 @@
     {checked_by_default_p:boolean 0}
 }
 
-ad_return_top_of_page "[apm_header "Package Installation"]
+set page_content "[apm_header "Package Installation"]
 <p>Please wait while the installer searches your system for packages to install ...<p>
 
 "
@@ -63,12 +63,12 @@
 
 apm_log APMDebug $spec_files
 
-ns_write "Done.<p>
+append page_content "Done.<p>
 "
 
 if { [empty_string_p $spec_files] } {
     # No spec files to work with.
-    ns_write "
+    append page_content "
     <h2>No New Packages to Install</h2><p>
 
     There are no new packages to install.  Please load some
@@ -77,11 +77,11 @@
     "
 } else {   
     
-    ns_write "
+    append page_content "
     <h2>Select Packages to Install</h2><p>
     <p>Please select the set of packages you'd like to install.</p>"
 
-    ns_write "
+    append page_content "
 
 <script language=javascript>
 function uncheckAll() {
@@ -99,7 +99,7 @@
 <a href=\"packages-install?checked_by_default_p=1\"  onclick=\"javascript:checkAll(); return false\"><b>check all boxes</b></a>
 "
 
-    ns_write "<form action=packages-install-2 method=post>"
+    append page_content "<form action=packages-install-2 method=post>"
 
     # Client properties do not deplete the limited URL variable space.
     # But they are limited to the maximum length of a varchar ...
@@ -132,19 +132,19 @@
     }
 
     if {[empty_string_p $widget]} {
-	ns_write "There are no new packages available.<p>
+	append page_content "There are no new packages available.<p>
 	[ad_footer]"
 	ad_script_abort
     }
     
-    ns_write $widget
-    ns_write "
+    append page_content $widget
+    append page_content "
     <input type=submit value=\"Next -->\">
     </form>
     "
     
     if {![empty_string_p $errors]} {
-	ns_write "The following errors were generated
+	append page_content "The following errors were generated
 	<ul>
 	    $errors
 	</ul>
@@ -162,6 +162,6 @@
 
 
 
-ns_write "
+append page_content "
 [ad_footer]
 "