Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	10 Jan 2007 21:21:59 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	13 Apr 2009 23:10:27 -0000	1.4
@@ -17,19 +17,18 @@
 
 "
 
-foreach dependency_type { provide require } {
-    set other_dependency_type [ad_decode $dependency_type "provide" "require" "provide"]
-    doc_body_append "<h3>Services [string totitle $dependency_type]d</h3><ul>\n"
+foreach dependency_type { provide extend require } {
 
     set dependency_type_prep "${dependency_type}s"
-    db_foreach apm_all_dependencies {
-	select dependency_id, service_uri, service_version
-	from   apm_package_dependencies
-	where  version_id = :version_id
-	and    dependency_type = :dependency_type_prep
-	order by service_uri
-    } {
-	doc_body_append "<li>[string totitle $dependency_type]s service $service_uri, version $service_version (<a href=\"version-dependency-remove?[export_url_vars dependency_id version_id dependency_type]\">remove</a>)\n"
+    if { [string index $dependency_type end] eq "e" } {
+        set dependency_type_prep_2 ${dependency_type}d
+    } else {
+        set dependency_type_prep_2 ${dependency_type}ed
+    }
+    doc_body_append "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
+
+    db_foreach apm_all_dependencies {} {
+	doc_body_append "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version (<a href=\"version-dependency-remove?[export_url_vars dependency_id version_id dependency_type]\">remove</a>)\n"
 	
 	# If this package provides a service, show a list of all packages that require it,
 	# or vice versa. If this package provides a service, show other packages requiring
@@ -39,20 +38,18 @@
 	set sign [ad_decode $dependency_type "provide" "<=" ">="]
 
 	set counter 0
-	set other_dependency_type_prep "${other_dependency_type}s"
-	db_foreach apm_specific_version_dependencies "
-select t.pretty_name dep_pretty_name, v.version_name dep_version_name, v.version_id dep_version_id
-from apm_package_versions v, apm_package_dependencies d, apm_package_types t
-where d.service_uri = :service_uri
-and d.dependency_type = :other_dependency_type_prep
-and d.version_id = v.version_id
-and t.package_key = v.package_key 
-and apm_package_version.sortable_version_name(d.service_version) $sign apm_package_version.sortable_version_name(:service_version)" {
-	    incr counter
+        set other_dependency_in [ad_decode $dependency_type "provide" "'requires','extends'" "'provides'"]
+	db_foreach apm_specific_version_dependencies {} {
+            incr counter
 	    if { $counter == 1 } {
 		doc_body_append "<ul>\n"
 	    }
-	    doc_body_append "<li>[string totitle $other_dependency_type]d by <a href=\"version-view?version_id=$dep_version_id\">$dep_pretty_name, version $dep_version_name</a>\n"
+            switch $dep_type {
+                provides { set dep_d provided }
+                requires { set dep_d required }
+                extends { set dep_d extended }
+            } 
+	    doc_body_append "<li>[string totitle $dep_d] by <a href=\"version-view?version_id=$dep_version_id\">$dep_pretty_name, version $dep_version_name</a>\n"
 	}
 	if { $counter != 0 } {
 	    doc_body_append "</ul>\n"
@@ -61,7 +58,7 @@
 	doc_body_append "<li>This package does not $dependency_type any services.\n"
     }
     if { $installed_p eq "t" } {
-	doc_body_append "<li><a href=\"version-dependency-add?[export_url_vars version_id dependency_type]\">Add a service ${dependency_type}d by this package</a>\n"
+	doc_body_append "<li><a href=\"version-dependency-add?[export_url_vars version_id dependency_type]\">Add a service $dependency_type_prep_2 by this package</a>\n"
     }
     doc_body_append "</ul>\n"
 }