LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fehlerhafte DataQueries korrigiert. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@969 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-06-17 18:47:57 +00:00
parent 697c3078f6
commit 946e111897
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciDepartment.pdl
View File

@ -51,14 +51,14 @@ query getIdsOfContactsOfSciDepartment {
} }
query getIdsOfSubDepartmentsOfSciDepartment { query getIdsOfSubDepartmentsOfSciDepartment {
BigDecimal departmentId; BigDecimal subDepartmentId;
do { do {
select ct_sciorga_departments_subdepartments_map.department_id select ct_sciorga_departments_subdepartments_map.subdepartment_id
from ct_sciorga_departments_subdepartments_map from ct_sciorga_departments_subdepartments_map
where ct_sciorga_departments_subdepartments_map.department_id = :department where ct_sciorga_departments_subdepartments_map.department_id = :department
} map { } map {
departmentId = ct_sciorga_departments_subdepartments_map.department_id; subDepartmentId = ct_sciorga_departments_subdepartments_map.subdepartment_id;
} }
} }

8
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciDepartment.java
View File

@ -369,7 +369,7 @@ public class SciDepartment extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (departmentsQuery.next()) { while (departmentsQuery.next()) {
departmentId = (BigDecimal) departmentsQuery.get( departmentId = (BigDecimal) departmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasMembers(departmentId, merge, status); result = hasMembers(departmentId, merge, status);
if (result) { if (result) {
@ -436,7 +436,7 @@ public class SciDepartment extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasMembers(subDepartmentId, merge, status); result = hasMembers(subDepartmentId, merge, status);
if (result) { if (result) {
@ -506,7 +506,7 @@ public class SciDepartment extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (departmentsQuery.next()) { while (departmentsQuery.next()) {
departmentId = (BigDecimal) departmentsQuery.get( departmentId = (BigDecimal) departmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasProjects(departmentId, merge, status); result = hasProjects(departmentId, merge, status);
if (result) { if (result) {
@ -578,7 +578,7 @@ public class SciDepartment extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasProjects(subDepartmentId, merge, status); result = hasProjects(subDepartmentId, merge, status);
if (result) { if (result) {

4
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java
View File

@ -293,7 +293,7 @@ public class SciOrganization extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasMembers(subDepartmentId, merge, status); result = hasMembers(subDepartmentId, merge, status);
if (result) { if (result) {
@ -435,7 +435,7 @@ public class SciOrganization extends GenericOrganizationalUnit {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasProjects(subDepartmentId, merge, status); result = hasProjects(subDepartmentId, merge, status);
if (result) { if (result) {

6
ccm-sci-types-organizationwithpublications/pdl/com/arsdigita/content-types/SciDepartmentWithPublications.pdl
View File

@ -23,13 +23,15 @@ association {
query getIdsOfPublicationsOfSciDepartment { query getIdsOfPublicationsOfSciDepartment {
BigDecimal publicationId; BigDecimal publicationId;
String objectType;
do { do {
select ct_department_publication_map.publication_id select ct_department_publication_map.publication_id, acs_objects.object_type
from ct_department_publication_map from ct_department_publication_map join acs_objects on ct_department_publication_map.publication_id = acs_objects.object_id
where ct_department_publication_map.department_id = :department where ct_department_publication_map.department_id = :department
} map { } map {
publicationId = ct_department_publication_map.publication_id; publicationId = ct_department_publication_map.publication_id;
objectType = acs_objects.object_type;
} }
} }

8
ccm-sci-types-organizationwithpublications/src/com/arsdigita/cms/contenttypes/SciDepartmentWithPublications.java
View File

@ -80,7 +80,7 @@ public class SciDepartmentWithPublications extends SciDepartment {
boolean result = false; boolean result = false;
while (departmentsQuery.next()) { while (departmentsQuery.next()) {
departmentId = (BigDecimal) departmentsQuery.get( departmentId = (BigDecimal) departmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasPublications(departmentId, merge); result = hasPublications(departmentId, merge);
if (result) { if (result) {
@ -124,7 +124,7 @@ public class SciDepartmentWithPublications extends SciDepartment {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasPublications(subDepartmentId, merge); result = hasPublications(subDepartmentId, merge);
if (result) { if (result) {
@ -167,7 +167,7 @@ public class SciDepartmentWithPublications extends SciDepartment {
boolean result = false; boolean result = false;
while (departmentsQuery.next()) { while (departmentsQuery.next()) {
departmentId = (BigDecimal) departmentsQuery.get( departmentId = (BigDecimal) departmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasWorkingPapers(departmentId, merge); result = hasWorkingPapers(departmentId, merge);
if (result) { if (result) {
@ -211,7 +211,7 @@ public class SciDepartmentWithPublications extends SciDepartment {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasPublications(subDepartmentId, merge); result = hasPublications(subDepartmentId, merge);
if (result) { if (result) {

14
ccm-sci-types-organizationwithpublications/src/com/arsdigita/cms/contenttypes/SciOrganizationWithPublications.java
View File

@ -87,8 +87,7 @@ public class SciOrganizationWithPublications extends SciOrganization {
DataQuery departmentsQuery = DataQuery departmentsQuery =
SessionManager.getSession().retrieveQuery( SessionManager.getSession().retrieveQuery(
"com.arsdigita.cms.contenttypes.getIdsOfDepartmentsOfSciOrganization"); "com.arsdigita.cms.contenttypes.getIdsOfDepartmentsOfSciOrganization");
departmentsQuery.setParameter("organization", departmentsQuery.setParameter("organization", getID());
getID());
if (departmentsQuery.size() > 0) { if (departmentsQuery.size() > 0) {
BigDecimal departmentId; BigDecimal departmentId;
@ -120,13 +119,15 @@ public class SciOrganizationWithPublications extends SciOrganization {
final boolean merge) { final boolean merge) {
DataQuery query = DataQuery query =
SessionManager.getSession().retrieveQuery( SessionManager.getSession().retrieveQuery(
"com.arsdigita.cms.contenttypes.getIdsOfPublicationsOfSciOrganization"); "com.arsdigita.cms.contenttypes.getIdsOfPublicationsOfSciDepartment");
query.setParameter("organization", departmentId); query.setParameter("department", departmentId);
if (getConfig().getOrganizationPublicationsSeparateWorkingPapers()) { if (getConfig().getOrganizationPublicationsSeparateWorkingPapers()) {
query.addFilter( query.addFilter(
"objectType != 'com.arsdigita.cms.contenttypes.WorkingPaper'"); "objectType != 'com.arsdigita.cms.contenttypes.WorkingPaper'");
} }
System.out.printf("Proceedings department id %s\n ", departmentId.toString());
if (query.size() > 0) { if (query.size() > 0) {
query.close(); query.close();
return true; return true;
@ -143,7 +144,8 @@ public class SciOrganizationWithPublications extends SciOrganization {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
System.out.printf("Proceesing sub department %s...\n", subDepartmentId.toString());
result = hasPublications(subDepartmentId, merge); result = hasPublications(subDepartmentId, merge);
if (result) { if (result) {
@ -236,7 +238,7 @@ public class SciOrganizationWithPublications extends SciOrganization {
boolean result = false; boolean result = false;
while (subDepartmentsQuery.next()) { while (subDepartmentsQuery.next()) {
subDepartmentId = (BigDecimal) subDepartmentsQuery.get( subDepartmentId = (BigDecimal) subDepartmentsQuery.get(
"departmentId"); "subDepartmentId");
result = hasPublications(subDepartmentId, merge); result = hasPublications(subDepartmentId, merge);
if (result) { if (result) {