Index: openacs-4/packages/acs-admin/www/apm/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/index-oracle.xql	5 May 2001 17:39:19 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/index-oracle.xql	13 May 2001 01:53:18 -0000	1.4
@@ -30,5 +30,15 @@
 
       </querytext>
 </fullquery>
- 
+
+<partialquery name="latest">
+   <querytext>
+      (installed_p = 't' or enabled_p = 't' or not exists (
+         select 1 from apm_package_versions v2
+         where v2.package_key = v.package_key
+           and (v2.installed_p = 't' or v2.enabled_p = 't')
+           and apm_package_version.sortable_version_name(v2.version_name) > apm_package_version.sortable_version_name(v.version_name)))
+   </querytext>
+</partialquery>
+
 </queryset>
Index: openacs-4/packages/acs-admin/www/apm/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/index-postgresql.xql	5 May 2001 17:39:19 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/index-postgresql.xql	13 May 2001 01:53:18 -0000	1.4
@@ -24,5 +24,15 @@
       </querytext>
 </fullquery>
 
+<partialquery name="latest">
+   <querytext>
+     (installed_p = 't' or enabled_p = 't' or not exists (
+        select 1 from apm_package_versions v2
+        where v2.package_key = v.package_key
+          and (v2.installed_p = 't' or v2.enabled_p = 't')
+         and apm_package_version__sortable_version_name(v2.version_name) >
+             apm_package_version__sortable_version_name(v.version_name)))
+   </querytext>
+</partialquery>
  
 </queryset>
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.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/index.tcl	27 Apr 2001 01:41:12 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	13 May 2001 01:53:18 -0000	1.4
@@ -21,27 +21,22 @@
 set dimensional_list {
     {
         supertype "Package Type:" apm_application {
-	    { apm_application "Applications" { where "t.package_type = 'apm_application'" } }
+	    { apm_application "Applications" { where "[db_map apm_application]" } }
 	    { apm_service "Services" { where "t.package_type = 'apm_service'"} }
 	    { all "All" {} }
 	}
     }
     {
 
 	owned_by "Owned by:" everyone {
-	    { me "Me" {where "exists (select 1 from apm_package_owners o where o.version_id = v.version_id and owner_uri='mailto:$my_email')"} }
+	    { me "Me" {where "[db_map everyone]"} }
 	    { everyone "Everyone" {where "1 = 1"} }
 	}
     }
     {
 	status "Status:" all {
 	    {
-		latest "Latest" {where "
-                    (installed_p = 't' or enabled_p = 't' or not exists (
-                        select 1 from apm_package_versions v2
-                        where v2.package_key = v.package_key
-                        and (v2.installed_p = 't' or v2.enabled_p = 't')
-		and apm_package_version.sortable_version_name(v2.version_name) > apm_package_version.sortable_version_name(v.version_name)))"}
+		latest "Latest" {where "[db_map latest]" }
 	    }
 	    { all "All" {where "1 = 1"} }
 	}