Index: openacs-4/packages/acs-admin/www/apm/file-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/file-watch.tcl 18 Sep 2002 14:54:45 -0000 1.5
+++ openacs-4/packages/acs-admin/www/apm/file-watch.tcl 31 Jan 2003 12:23:46 -0000 1.6
@@ -7,43 +7,52 @@
@creation-date 17 April 2000
@cvs-id $Id$
} {
- file_id:integer
+ file_id:integer,multiple
} -validate {
valid_version_id {
- set version_id [apm_version_from_file $file_id]
- if {$version_id == 0} {
- ad_complain
- }
+ foreach single_file_id $file_id {
+ set version_id [apm_version_from_file $single_file_id]
+ if { $version_id == 0 } {
+ ad_complain
+ }
+ }
}
} -errors {
valid_version_id {The file you have requested is not registerd.}
}
+set file_id_list $file_id
-db_1row apm_get_file_to_watch {
- select t.package_key, t.pretty_name,
- v.version_name, v.package_key, v.installed_p,
- f.path, f.version_id
- from apm_package_types t, apm_package_versions v, apm_package_files f
- where f.file_id = :file_id
- and f.version_id = v.version_id
- and v.package_key = t.package_key
-}
+set count 0
+foreach file_id $file_id_list {
+ incr count
-# Why did we need all that information? -KS
+ db_1row apm_get_file_to_watch {
+ select t.package_key, t.pretty_name,
+ v.version_name, v.package_key, v.installed_p,
+ f.path, f.version_id
+ from apm_package_types t, apm_package_versions v, apm_package_files f
+ where f.file_id = :file_id
+ and f.version_id = v.version_id
+ and v.package_key = t.package_key
+ }
+
+ # Why did we need all that information? -KS
+
+ db_1row apm_get_path_from_file_id {
+ select path from apm_package_files where file_id = :file_id
+ }
+
+ apm_file_watch "packages/$package_key/$path"
-doc_body_append "[apm_header -form "method=post action=\"file-add-2\"" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-files?version_id=$version_id" "Files"] "Watch file"]
-
-"
-
-db_1row apm_get_path_from_file_id {
- select path from apm_package_files where file_id = :file_id
+ lappend path_list $path
}
-apm_file_watch "packages/$package_key/$path"
+doc_body_append "[apm_header -form "method=post action=\"file-add-2\"" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-files?version_id=$version_id" "Files"] "Watch file"]"
-doc_body_append "Marking the following file to be watched:
+doc_body_append "Marking the following files to be watched:
+
Return to the list of files for $pretty_name $version_name
Return to the Package Manager
Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/index.tcl 29 Aug 2002 09:52:39 -0000 1.6
+++ openacs-4/packages/acs-admin/www/apm/index.tcl 31 Jan 2003 12:23:46 -0000 1.7
@@ -73,13 +73,17 @@
{ maintained "Maintained" "" {[ad_decode $distribution_uri "" "Locally" "Externally"] | } }
{
action "" "" { [eval {
- ns_log Notice "Status for $version_id: [apm_version_load_status $version_id]"
+
+ # LARS: Ugh! We were calling the expensive 'apm_version_load_status' proc twice!
+ # ns_log Notice "Status for $version_id: [apm_version_load_status $version_id]"
+
+
if { $installed_p == "t" && $enabled_p == "t" && \
- [string equal [apm_version_load_status $version_id] "needs_reload"] } {
+ [string equal [apm_version_load_status $version_id] "needs_reload"]} {
format "reload"
} else {
- format ""
- }
+ set format ""
+ }
}] | }
}
}
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl 10 Sep 2002 22:21:59 -0000 1.2
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl 31 Jan 2003 12:23:46 -0000 1.3
@@ -15,6 +15,8 @@
# files in $files.
apm_mark_version_for_reload $version_id files
+set file_id_list [list]
+
if { [llength $files] == 0 } {
doc_body_append "There are no changed files to reload in this package."
} else {
@@ -29,7 +31,8 @@
} else {
# This file isn't being watched right now - provide a link setting a watch on it.
set files_to_watch_p 1
- doc_body_append " (watch this file)"
+ doc_body_append " (watch this file)"
+ lappend file_id_list $file_id
}
doc_body_append "\n"
}
@@ -40,6 +43,8 @@
doc_body_append "If you know you're going to be modifying one of the above files frequently,
select the \"watch this file\" link next to a filename to cause the interpreters to
reload the file immediately whenever it is changed.
+ (watch all above files)
+
"
}
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl 29 Jan 2003 15:53:23 -0000 1.8
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 31 Jan 2003 12:23:46 -0000 1.9
@@ -204,42 +204,50 @@
+Manage
+
+XML .info package specification file
+Disable/Uninstall