Index: openacs-4/packages/acs-admin/www/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/install/install.tcl	16 Oct 2003 11:42:55 -0000	1.2
+++ openacs-4/packages/acs-admin/www/install/install.tcl	20 Apr 2004 21:12:29 -0000	1.3
@@ -1,7 +1,7 @@
 ad_page_contract {
     Install from local file system
 } {
-    {package_type "apm_application"}
+    package_type:optional
     {upgrade_p 0}
     {repository_url ""}
 }
@@ -32,7 +32,7 @@
     array unset version
     array set version $repository($package_key)
 
-    if {  [string equal $package_type "all"] || [string equal $version(package.type) $package_type] } {
+    if { ![exists_and_not_null package_type] || [string equal $version(package.type) $package_type] } {
         set package_key $version(package.key)
             
         # If in upgrade mode, only add to list if it's an upgrade
@@ -43,7 +43,8 @@
                      $version(package-name) \
                      $version(name) \
                      $version(package.type) \
-                     $version(install_type)]
+                     $version(install_type) \
+                     $version(summary)]
         }
     }
 }
@@ -56,22 +57,24 @@
 #####
 
 # Sort the list alphabetically (in case package_name and package_key doesn't sort the same)
-multirow create packages package_key package_name version_name package_type install_type
+multirow create packages package_key package_name version_name package_type install_type summary
 foreach name [lsort -ascii [array names package]] {
     set row $package($name)
     multirow append packages \
         [lindex $row 0] \
         [lindex $row 1] \
         [lindex $row 2] \
         [lindex $row 3] \
-        [lindex $row 4]
+        [lindex $row 4] \
+        [lindex $row 5]
 }
 
 multirow extend packages install_url
-multirow foreach packages {
+multirow -unclobber foreach packages {
     set install_url [export_vars -base install-2 { package_key repository_url }]
 }
 
+
 # Build the list-builder list
 template::list::create \
     -name packages \
@@ -85,23 +88,44 @@
     } \
     -elements {
         package_name {
-            label "Application"
+            label "Package"
+            link_url_col install_url
+            link_html { title "Install this package" }
         }
+        summary {
+            label "Summary"
+        }   
         version_name {
             label "Version"
         }
+        package_type {
+            label "Type"
+            display_eval {[ad_decode $package_type "apm_application" "Application" "Service"]}
+        }
         upgrade {
             label "Upgrade"
             hide_p {[ad_decode $upgrades_p 1 0 1]}
             display_eval {[ad_decode $install_type "upgrade" "Upgrade" ""]}
         }
-        install {
-            label "Install"
-            link_url_col install_url
-            link_html { title "Install single application" }
-            display_template {Install}
+    } -filters {
+        package_type {
+            label "Type"
+            values {
+                {Application apm_application}
+                {Service apm_service}
+            }
         }
+        upgrade_p {
+            label "Upgrade"
+            values {
+                {"Install" 0}
+                {"Upgrade" 1}
+            }
+            default_value 0
+        }
+        repository_url {
+            hide_p 1
+        }
     }
 
 
-