From a6fda4180b1e7e3bd43ed4bb082c6f87a9ca4ae4 Mon Sep 17 00:00:00 2001 From: pb Date: Wed, 30 Jan 2013 21:21:36 +0000 Subject: [PATCH] PDL adjusted to removal of old style application code. git-svn-id: https://svn.libreccm.org/ccm/trunk@2058 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/portalserver/Workspace.pdl | 92 +++++++++---------- .../arsdigita/portalworkspace/Workspace.pdl | 2 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ccm-portalserver/pdl/com/arsdigita/portalserver/Workspace.pdl b/ccm-portalserver/pdl/com/arsdigita/portalserver/Workspace.pdl index b369e5e71..27d5fd295 100644 --- a/ccm-portalserver/pdl/com/arsdigita/portalserver/Workspace.pdl +++ b/ccm-portalserver/pdl/com/arsdigita/portalserver/Workspace.pdl @@ -86,7 +86,7 @@ query childWorkspacesForApplicationID { workspace.displayName = acs_objects.display_name; workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.parentResource.id = applications.parent_application_id; - workspace.packageInstance.id = applications.package_id; +// workspace.packageInstance.id = applications.package_id; (Old stype app code removed in 6.6.5) workspace.title = applications.title; workspace.description = applications.description; workspace.primaryURL = applications.primary_url; @@ -106,7 +106,7 @@ query rootWorkspaces { acs_objects.display_name, acs_objects.default_domain_class, applications.parent_application_id, - applications.package_id, +// applications.package_id, applications.title, applications.description, applications.primary_url, @@ -129,7 +129,7 @@ query rootWorkspaces { workspace.displayName = acs_objects.display_name; workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.parentResource.id = applications.parent_application_id; - workspace.packageInstance.id = applications.package_id; +// workspace.packageInstance.id = applications.package_id; workspace.title = applications.title; workspace.description = applications.description; workspace.primaryURL = applications.primary_url; @@ -139,49 +139,49 @@ query rootWorkspaces { } } -query workspaceForSiteNodeID { - Workspace workspace; - - do { - select - acs_objects.object_id, - acs_objects.object_type, - acs_objects.display_name, - acs_objects.default_domain_class, - applications.parent_application_id, - applications.package_id, - applications.title, - applications.description, - applications.primary_url, - ps_workspaces.ready_p, - ps_workspaces.mission - from - site_nodes, - apm_packages, - applications, - acs_objects, - ps_workspaces - where - site_nodes.node_id = :siteNodeID - -- joins - and site_nodes.object_id = apm_packages.package_id - and apm_packages.package_id = applications.package_id - and applications.application_id = acs_objects.object_id - and applications.application_id = ps_workspaces.workspace_id - } map { - workspace.id = acs_objects.object_id; - workspace.objectType = acs_objects.object_type; - workspace.displayName = acs_objects.display_name; - workspace.defaultDomainClass = acs_objects.default_domain_class; - workspace.parentResource.id = applications.parent_application_id; - workspace.packageInstance.id = applications.package_id; - workspace.title = applications.title; - workspace.description = applications.description; - workspace.primaryURL = applications.primary_url; - workspace.isReady = ps_workspaces.ready_p; - workspace.mission = ps_workspaces.mission; - } -} +// (pb) query workspaceForSiteNodeID { +// (pb) Workspace workspace; +// (pb) +// (pb) do { +// (pb) select +// (pb) acs_objects.object_id, +// (pb) acs_objects.object_type, +// (pb) acs_objects.display_name, +// (pb) acs_objects.default_domain_class, +// (pb) applications.parent_application_id, +// (pb) applications.package_id, +// (pb) applications.title, +// (pb) applications.description, +// (pb) applications.primary_url, +// (pb) ps_workspaces.ready_p, +// (pb) ps_workspaces.mission +// (pb) from +// (pb) site_nodes, +// (pb) apm_packages, +// (pb) applications, +// (pb) acs_objects, +// (pb) ps_workspaces +// (pb) where +// (pb) site_nodes.node_id = :siteNodeID +// (pb) -- joins +// (pb) and site_nodes.object_id = apm_packages.package_id +// (pb) and apm_packages.package_id = applications.package_id +// (pb) and applications.application_id = acs_objects.object_id +// (pb) and applications.application_id = ps_workspaces.workspace_id +// (pb) } map { +// (pb) workspace.id = acs_objects.object_id; +// (pb) workspace.objectType = acs_objects.object_type; +// (pb) workspace.displayName = acs_objects.display_name; +// (pb) workspace.defaultDomainClass = acs_objects.default_domain_class; +// (pb) workspace.parentResource.id = applications.parent_application_id; +// (pb) workspace.packageInstance.id = applications.package_id; +// (pb) workspace.title = applications.title; +// (pb) workspace.description = applications.description; +// (pb) workspace.primaryURL = applications.primary_url; +// (pb) workspace.isReady = ps_workspaces.ready_p; +// (pb) workspace.mission = ps_workspaces.mission; +// (pb) } +// (pb) } query RolesForUser { BigDecimal groupID; diff --git a/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl index 5297772c9..40b7c71d4 100755 --- a/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl @@ -74,7 +74,7 @@ query childWorkspacesForApplicationID { workspace.displayName = acs_objects.display_name; workspace.defaultDomainClass = acs_objects.default_domain_class; workspace.parentResource.id = applications.parent_application_id; - workspace.packageInstance.id = applications.package_id; +// workspace.packageInstance.id = applications.package_id; (Old style app code removed) workspace.title = applications.title; workspace.primaryURL = applications.primary_url; workspace.description = applications.description;