From f6ef24d03c41d6cd0a06739d50c3e5fbb2966cca Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 19 Nov 2011 14:10:20 +0000
Subject: [PATCH] - Sichern des aktuellen Standes der neuen Sci-Typen. -
 Kleinere Bug-Fixes an anderen Stellen

git-svn-id: https://svn.libreccm.org/ccm/trunk@1270 8810af33-2d31-482b-a856-94f89814c4df
---
 .../contenttypes/ui/panels/CompareFilter.java |  22 ++-
 .../contenttypes/ui/panels/SelectFilter.java  |  38 ++++-
 .../PersonalPublicationsConfig.java           |   2 +-
 .../arsdigita/content-types/Publication.pdl   |  12 +-
 .../cms/contenttypes/SciDepartmentConfig.java |   2 +-
 .../ui/SciDepartmentMembersTab.java           |  10 +-
 .../ui/SciDepartmentProjectsTab.java          |  68 ++++++--
 .../ui/SciDepartmentPublicationsTab.java      | 151 +++++++++++-------
 .../arsdigita/content-types/SciProject.pdl    |   5 +-
 .../arsdigita/cms/contenttypes/SciProject.xml |   4 +-
 .../contenttypes/ui/SciProjectSummaryTab.java |  38 +++--
 11 files changed, 240 insertions(+), 112 deletions(-)

diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CompareFilter.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CompareFilter.java
index 70b4cb3e5..5ac2d2755 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CompareFilter.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/CompareFilter.java
@@ -16,11 +16,13 @@ import java.util.Map;
 public class CompareFilter implements Filter {
 
     private static final String ALL = "--ALL--";
+    private static final String NONE = "--NONE--";
     private final String property;
     private final String label;
     private final boolean allOption;
     private final boolean allOptionIsDefault;
     private final boolean propertyIsNumeric;
+    private boolean emptyDefaultOption = false;
     private Map<String, Option> options = new LinkedHashMap<String, Option>();
     private String value;
 
@@ -36,6 +38,16 @@ public class CompareFilter implements Filter {
         this.propertyIsNumeric = propertyIsNumeric;
     }
 
+    public CompareFilter(final String label,
+                         final String property,
+                         final boolean allOption,
+                         final boolean allOptionIsDefault,
+                         final boolean propertyIsNumeric,
+                         final boolean emptyDefaultOption) {
+        this(label, property, allOption, allOptionIsDefault, propertyIsNumeric);
+        this.emptyDefaultOption = true;
+    }
+
     @Override
     public String getProperty() {
         return property;
@@ -67,13 +79,15 @@ public class CompareFilter implements Filter {
         if ((value == null) || value.isEmpty()) {
             if (allOptionIsDefault) {
                 value = ALL;
+            } else if (emptyDefaultOption) {
+                return "";
             } else {
                 value =
                 new ArrayList<Option>(options.values()).get(0).getLabel();
             }
         }
 
-        if (ALL.equals(value)) {
+        if (ALL.equals(value) || NONE.equals(value)) {
             return "";
         }
 
@@ -132,6 +146,8 @@ public class CompareFilter implements Filter {
         if ((value == null) || value.isEmpty()) {
             if (allOptionIsDefault) {
                 selected = ALL;
+            } else if (emptyDefaultOption) {
+                selected = NONE;
             } else {
                 List<Option> optionsList =
                              new ArrayList<Option>(options.values());
@@ -151,6 +167,10 @@ public class CompareFilter implements Filter {
             option.addAttribute("label", ALL);
         }
 
+        if (emptyDefaultOption) {
+            final Element emptyOption = filter.newChildElement("option");
+            emptyOption.addAttribute("label", NONE);
+        }
         Element option;
         for (Map.Entry<String, Option> entry : options.entrySet()) {
             option = filter.newChildElement("option");
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/SelectFilter.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/SelectFilter.java
index af4be49aa..883453dab 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/SelectFilter.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/SelectFilter.java
@@ -18,6 +18,7 @@ import java.util.Set;
  */
 public class SelectFilter implements Filter {
 
+    public static final String NONE = "--NONE--";
     public static final String ALL = "--ALL--";
     private final String property;
     private final String label;
@@ -27,6 +28,7 @@ public class SelectFilter implements Filter {
     private final boolean allOptionIsDefault;
     private final boolean reverseOptions;
     private final boolean propertyIsNumeric;
+    private boolean emptyDefaultOption = false;
     private String value;
 
     public SelectFilter(final String label,
@@ -43,6 +45,18 @@ public class SelectFilter implements Filter {
         this.allOptionIsDefault = allOptionIsDefault;
         this.propertyIsNumeric = propertyIsNumeric;
     }
+    
+    public SelectFilter(final String label,
+                        final String property,
+                        final boolean reverseOptions,
+                        final boolean allOption,
+                        final boolean allOptionIsDefault,
+                        final boolean propertyIsNumeric,
+                        final boolean emptyDefaultOption) {
+        this(label, property, reverseOptions, allOption, allOptionIsDefault,
+             propertyIsNumeric);
+        this.emptyDefaultOption = emptyDefaultOption;
+    }
 
     @Override
     public String getProperty() {
@@ -60,19 +74,18 @@ public class SelectFilter implements Filter {
         this.queryProperty = queryProperty;
     }
 
-    public String getFilter() {
-        List<String> options;
-
-        options = getOptions();
+    public String getFilter() {        
         if ((value == null) || value.isEmpty()) {
             if (allOptionIsDefault) {
                 value = ALL;
+            } else if(emptyDefaultOption) {
+                value = NONE;
             } else {
-                value = options.get(0);
+                value = getOptions().get(0);
             }
         }
 
-        if (ALL.equals(value)) {
+        if (ALL.equals(value) || NONE.equals(value)) {
             return null;
         }
 
@@ -95,9 +108,15 @@ public class SelectFilter implements Filter {
         filter = parent.newChildElement("filter");
         filter.addAttribute("type", "select");
 
+        if(options.isEmpty()) {
+            return;
+        }
+        
         if ((value == null) || value.isEmpty()) {
             if (allOptionIsDefault) {
                 selected = ALL;
+            } else if(emptyDefaultOption) {
+                selected = NONE;
             } else {
                 selected = options.get(0);
             }
@@ -108,6 +127,11 @@ public class SelectFilter implements Filter {
         filter.addAttribute("label", label);
         filter.addAttribute("selected", selected);
 
+        if (emptyDefaultOption) {
+            optionElem = filter.newChildElement("option");
+            optionElem.addAttribute("label", NONE);
+        }
+        
         if (allOption) {
             optionElem = filter.newChildElement("option");
             optionElem.addAttribute("label", ALL);
@@ -135,7 +159,7 @@ public class SelectFilter implements Filter {
         List<String> options;
 
         optionsSet = new HashSet<String>();
-                
+              
         while(dataQuery.next()) {
             obj = dataQuery.get(queryProperty);
             if (obj == null) {
diff --git a/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublicationsConfig.java b/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublicationsConfig.java
index af986dc34..69e532cf0 100644
--- a/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublicationsConfig.java
+++ b/ccm-sci-personalpublications/src/com/arsdigita/cms/publicpersonalprofile/PersonalPublicationsConfig.java
@@ -94,7 +94,7 @@ public class PersonalPublicationsConfig extends AbstractConfig {
         order = new StringParameter(
                 "com.arsdigita.cms.publicpersonlprofile.publications.order",
                 Parameter.REQUIRED,
-                "year,title");
+                "year,authors,title");
 
         register(publicationGroups);
         register(groupSplit);
diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
index 7ab62eb6d..9249600c9 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
@@ -107,7 +107,8 @@ query getIdsOfPublicationsForOrgaUnitOneRowPerAuthor {
         join cms_organizationalunits_publications_map on cms_pages.item_id = cms_organizationalunits_publications_map.publication_id
         join cms_organizationalunits on cms_organizationalunits_publications_map.orgaunit_id = cms_organizationalunits.organizationalunit_id
         join acs_objects on cms_pages.item_id = acs_objects.object_id
-        join cms_items on cms_items.item_id = cms_pages.item_id;
+        join cms_items on cms_items.item_id = cms_pages.item_id
+        where cms_organizationalunits.organizationalunit_id in :orgaunitIds
     } map {
         publicationId = cms_pages.item_id;
         objectType = acs_objects.object_type;
@@ -131,6 +132,7 @@ query getIdsOfPublicationsForOrgaUnit {
     Integer year;
     String authors;
     String language;
+    Boolean reviewed;
 
     do {
         select cms_pages.item_id, 
@@ -138,14 +140,16 @@ query getIdsOfPublicationsForOrgaUnit {
                cms_pages.title, 
                cms_organizationalunits.organizationalunit_id, 
                ct_publications.year, 
-               ct_publications.authors              
-               cms_items.language
+               ct_publications.authors,              
+               cms_items.language,
+               ct_publications.reviewed
         from cms_pages
         join ct_publications on cms_pages.item_id = ct_publications.publication_id 
         join cms_organizationalunits_publications_map on cms_pages.item_id = cms_organizationalunits_publications_map.publication_id
         join cms_organizationalunits on cms_organizationalunits_publications_map.orgaunit_id = cms_organizationalunits.organizationalunit_id        
         join acs_objects on cms_pages.item_id = acs_objects.object_id
         join cms_items on cms_pages.item_id = cms_items.item_id
+        where cms_organizationalunits.organizationalunit_id in :orgaunitIds
     } map {
         publicationId = cms_pages.item_id;
         objectType = acs_objects.object_type;
@@ -153,6 +157,8 @@ query getIdsOfPublicationsForOrgaUnit {
         title = cms_pages.title;
         year = ct_publications.year;        
         authors = ct_publications.authors;
+        language = cms_items.language;
+        reviewed = ct_publications.reviewed;
     }
 }
 
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/SciDepartmentConfig.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/SciDepartmentConfig.java
index 5e807a587..1b2abe0f5 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/SciDepartmentConfig.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/SciDepartmentConfig.java
@@ -70,7 +70,7 @@ public class SciDepartmentConfig extends AbstractConfig {
         new StringParameter(
                 "com.arsdigita.cms.contenttypes.sciproject.tabs",
                 Parameter.REQUIRED,
-                "summary:com.arsdigita.cms.contenttypes.ui.SciDepartmentSummaryTab;desc:com.arsdigita.cms.contenttypes.ui.SciDepartmentDescTab;members:com.arsdigita.cms.contenttypes.ui.SciDepartmentMembersTab");
+                "summary:com.arsdigita.cms.contenttypes.ui.SciDepartmentSummaryTab;desc:com.arsdigita.cms.contenttypes.ui.SciDepartmentDescTab;members:com.arsdigita.cms.contenttypes.ui.SciDepartmentMembersTab;projects:com.arsdigita.cms.contenttypes.ui.SciDepartmentProjectsTab;publications:com.arsdigita.cms.contenttypes.ui.SciDepartmentPublicationsTab");
 
         register(enableSubDepartmentsStep);
         register(enableSuperDepartmentsStep);
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersTab.java
index 7c498d3e7..6802fe545 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersTab.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersTab.java
@@ -132,7 +132,7 @@ public class SciDepartmentMembersTab implements GenericOrgaUnitTab {
         final DataQuery personsQuery = SessionManager.getSession().
                 retrieveQuery(
                 "com.arsdigita.cms.contenttypes.getIdsOfMembersOfOrgaUnits");
-        final StringBuffer personsFilter = new StringBuffer();
+        //final StringBuffer personsFilter = new StringBuffer();
         final List<String> orgaUnitIds = new ArrayList<String>();
 
         if (config.isMergingMembers()) {
@@ -145,18 +145,18 @@ public class SciDepartmentMembersTab implements GenericOrgaUnitTab {
                                              SciDepartmentSubDepartmentsStep.ASSOC_TYPE);
 
             while (subDepartmentsQuery.next()) {
-                if (personsFilter.length() > 0) {
+                /*if (personsFilter.length() > 0) {
                     personsFilter.append(" or ");
                 }
                 personsFilter.append(String.format("orgaunitId = %s",
                                                    subDepartmentsQuery.get(
-                        "orgaunitId").toString()));
+                        "orgaunitId").toString()));*/
                 orgaUnitIds.add(subDepartmentsQuery.get(
                         "orgaunitId").toString());
             }
         } else {
-            personsFilter.append(String.format("orgaunitId = %s",
-                                               orgaunit.getID().toString()));
+            /*personsFilter.append(String.format("orgaunitId = %s",
+                                               orgaunit.getID().toString()));*/
             orgaUnitIds.add(orgaunit.getID().toString());
         }
                
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
index ff73ae90e..c5cd1128d 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
@@ -17,6 +17,10 @@ import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 
@@ -37,6 +41,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
                                                                  "projectEnd",
                                                                  false,
                                                                  false,
+                                                                 false,
                                                                  true);
     private final TextFilter titleFilter = new TextFilter(TITLE_PARAM,
                                                           ContentPage.TITLE);
@@ -45,6 +50,23 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
         config.load();
     }
 
+    public SciDepartmentProjectsTab() {
+        final Calendar now = new GregorianCalendar();
+        final String today = String.format("%d-%02d-%02d",
+                                           now.get(Calendar.YEAR),
+                                           now.get(Calendar.MONTH) + 1,
+                                           now.get(Calendar.DAY_OF_MONTH));
+
+        statusFilter.addOption("currentProjects",
+                               CompareFilter.Operators.GTEQ,
+                               today,
+                               true);
+        statusFilter.addOption("finishedProjects",
+                               CompareFilter.Operators.LT,
+                               today,
+                               false);
+    }
+
     public boolean hasData(final GenericOrganizationalUnit orgaunit) {
         final long start = System.currentTimeMillis();
         final ContentTypeCollection types = ContentType.getAllContentTypes();
@@ -81,9 +103,13 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
         statusFilter.generateXml(filtersElem);
 
         if (((request.getParameter(STATUS_PARAM) == null)
-             || (request.getParameter(STATUS_PARAM).trim().isEmpty()))
+             || (request.getParameter(STATUS_PARAM).trim().isEmpty())
+             || (statusFilter.getFilter() == null)
+             || (statusFilter.getFilter().trim().isEmpty()))
             && ((request.getParameter(TITLE_PARAM) == null)
-                || request.getParameter(TITLE_PARAM).trim().isEmpty())) {
+                || request.getParameter(TITLE_PARAM).trim().isEmpty())
+                || (titleFilter.getFilter() == null)
+                || !(titleFilter.getFilter().trim().isEmpty())) {
 
             depProjectsElem.newChildElement("greeting");
 
@@ -112,7 +138,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
             paginator.applyLimits(projects);
             paginator.generateXml(depProjectsElem);
         }
-
+              
         while (projects.next()) {
             generateProjectXml((BigDecimal) projects.get("projectId"),
                                depProjectsElem,
@@ -138,8 +164,9 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
 
         final DataQuery projectsQuery = SessionManager.getSession().
                 retrieveQuery(
-                "com.arsdigita.cms.contenttypes. getIdsOfProjectsOfOrgaUnit");
-        final StringBuffer projectsFilter = new StringBuffer();
+                "com.arsdigita.cms.contenttypes.getIdsOfProjectsOfOrgaUnit");
+        //final StringBuffer projectsFilter = new StringBuffer();
+        final List<String> orgaunitIds = new ArrayList<String>();
 
         if (config.isMergingProjects()) {
             final DataQuery subDepartmentsQuery =
@@ -151,19 +178,22 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
                                              SciDepartmentProjectsStep.ASSOC_TYPE);
 
             while (subDepartmentsQuery.next()) {
-                if (projectsFilter.length() > 0) {
-                    projectsFilter.append(" or ");
+                /*if (projectsFilter.length() > 0) {
+                projectsFilter.append(" or ");
                 }
                 projectsFilter.append(String.format("orgaunitId = %s",
-                                                    subDepartmentsQuery.get(
-                        "orgaunitId").toString()));
+                subDepartmentsQuery.get(
+                "orgaunitId").toString()));*/
+                orgaunitIds.add(subDepartmentsQuery.get("orgaunitId").toString());
             }
         } else {
-            projectsFilter.append(String.format("orgaunitId = %s",
-                                                orgaunit.getID().toString()));
+            //projectsFilter.append(String.format("orgaunitId = %s",
+            //                                  orgaunit.getID().toString()));
+            orgaunitIds.add(orgaunit.getID().toString());
         }
 
-        projectsQuery.addFilter(projectsFilter.toString());
+        //projectsQuery.addFilter(projectsFilter.toString());
+        projectsQuery.setParameter("orgaunitIds", orgaunitIds);
 
         logger.debug(String.format(
                 "Got projects of department '%s'"
@@ -181,7 +211,10 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
             statusFilter.setValue(statusValue);
         }
 
-        projects.addFilter(statusFilter.getFilter());
+        if ((statusFilter.getFilter() != null)
+            && !(statusFilter.getFilter().trim().isEmpty())) {
+            projects.addFilter(statusFilter.getFilter());
+        }
     }
 
     private void applyTitleFilter(final DataQuery projects,
@@ -191,7 +224,10 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
             titleFilter.setValue(titleValue);
         }
 
-        projects.addFilter(titleFilter.getFilter());
+        if ((titleFilter.getFilter() != null)
+            && !(titleFilter.getFilter().trim().isEmpty())) {
+            projects.addFilter(titleFilter.getFilter());
+        }
     }
 
     private void generateProjectXml(final BigDecimal projectId,
@@ -213,7 +249,9 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
                                     final PageState state) {
         final long start = System.currentTimeMillis();
         final XmlGenerator generator = new XmlGenerator(project);
-        generator.generateXML(state, parent, "");
+        generator.setItemElemName("project", "");
+        generator.setUseExtraXml(false);
+        generator.generateXML(state, parent, "");        
         logger.debug(String.format("Generated XML for project '%s' in %d ms.",
                                    project.getName(),
                                    System.currentTimeMillis() - start));
diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java
index 3f4c48dfb..4d49ebc1a 100644
--- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java
+++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java
@@ -17,6 +17,8 @@ import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 
@@ -34,16 +36,17 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
     private static final String YEAR_PARAM = "year";
     private static final String TITLE_PARAM = "title";
     private static final String AUTHOR_PARAM = "author";
-    private static final String SORT_PARAM = "sortBy";
+    /*private static final String SORT_PARAM = "sortBy";
     private static final String SORT_BY_YEAR_ASC = "yearAsc";
     private static final String SORT_BY_YEAR_DESC = "yearDesc";
     private static final String SORT_BY_TITLE = "title";
-    private static final String SORT_BY_AUTHOR = "author";
+    private static final String SORT_BY_AUTHOR = "author";*/
     private final SelectFilter yearFilter = new SelectFilter(YEAR_PARAM,
                                                              YEAR_PARAM,
                                                              true,
+                                                             true,
                                                              false,
-                                                             false,
+                                                             true,
                                                              true);
     private final TextFilter titleFilter = new TextFilter(TITLE_PARAM,
                                                           ContentPage.TITLE);
@@ -97,15 +100,15 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
         final String yearValue = request.getParameter(YEAR_PARAM);
         final String titleValue = request.getParameter(TITLE_PARAM);
         final String authorValue = request.getParameter(AUTHOR_PARAM);
-        final String sortValue = request.getParameter(SORT_PARAM);
+        //final String sortValue = request.getParameter(SORT_PARAM);
 
         final Element filtersElem = depPublicationsElem.newChildElement(
                 "filters");
 
         if (((yearValue == null) || yearValue.trim().isEmpty())
             && ((titleValue == null) || titleValue.trim().isEmpty())
-            && ((authorValue == null) || authorValue.trim().isEmpty())
-            && ((sortValue == null) || sortValue.trim().isEmpty())) {
+            && ((authorValue == null) || authorValue.trim().isEmpty())) {
+            //&& ((sortValue == null) || sortValue.trim().isEmpty())) {
 
             depPublicationsElem.newChildElement("greeting");
 
@@ -119,54 +122,66 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
 
             publications.setRange(1, config.getGreetingSize() + 1);
 
+            yearFilter.setDataQuery(publications, "year");
+
             yearFilter.generateXml(filtersElem);
             titleFilter.generateXml(filtersElem);
             authorFilter.generateXml(filtersElem);
 
         } else {
 
-            if (SORT_BY_AUTHOR.equals(sortValue)) {
-                if (config.getOneRowPerAuthor()) {
-                    publications.addOrder("surname");
-                } else {
-                    publications.addOrder("authors");
-                }
-                publications.addOrder("title");
-                publications.addOrder("year asc");
+            /*if (SORT_BY_AUTHOR.equals(sortValue)) {
+            if (config.getOneRowPerAuthor()) {
+            publications.addOrder("surname");
+            } else {
+            publications.addOrder("authors");
+            }
+            publications.addOrder("title");
+            publications.addOrder("year asc");
             } else if (SORT_BY_TITLE.equals(sortValue)) {
-                publications.addOrder("title");
-                if (config.getOneRowPerAuthor()) {
-                    publications.addOrder("surname");
-                } else {
-                    publications.addOrder("authors");
-                }
-                publications.addOrder("year asc");
+            publications.addOrder("title");
+            if (config.getOneRowPerAuthor()) {
+            publications.addOrder("surname");
+            } else {
+            publications.addOrder("authors");
+            }
+            publications.addOrder("year asc");
             } else if (SORT_BY_YEAR_ASC.equals(sortValue)) {
-                publications.addOrder("year asc");
-                if (config.getOneRowPerAuthor()) {
-                    publications.addOrder("surname");
-                } else {
-                    publications.addOrder("authors");
-                }
-                publications.addOrder("title");
+            publications.addOrder("year asc");
+            if (config.getOneRowPerAuthor()) {
+            publications.addOrder("surname");
+            } else {
+            publications.addOrder("authors");
+            }
+            publications.addOrder("title");
             } else if (SORT_BY_YEAR_DESC.equals(sortValue)) {
-                publications.addOrder("year desc");
-                if (config.getOneRowPerAuthor()) {
-                    publications.addOrder("surname");
-                } else {
-                    publications.addOrder("authors");
-                }
+            publications.addOrder("year desc");
+            if (config.getOneRowPerAuthor()) {
+            publications.addOrder("surname");
+            } else {
+            publications.addOrder("authors");
+            }
+            publications.addOrder("title");
+            } else {
+            if (config.getOneRowPerAuthor()) {
+            publications.addOrder("surname");
+            } else {
+            publications.addOrder("authors");
+            }
+            publications.addOrder("title");
+            publications.addOrder("year asc");
+            }*/
+
+            if (config.getOneRowPerAuthor()) {
+                publications.addOrder("surname");
                 publications.addOrder("title");
             } else {
-                if (config.getOneRowPerAuthor()) {
-                    publications.addOrder("surname");
-                } else {
-                    publications.addOrder("authors");
-                }
+                publications.addOrder("authors");
                 publications.addOrder("title");
-                publications.addOrder("year asc");
             }
 
+            yearFilter.setDataQuery(publications, "year");
+            
             applyYearFilter(publications, request);
             applyTitleFilter(publications, request);
             applyAuthorFilter(publications, request);
@@ -175,7 +190,10 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
                                                       (int) publications.size(),
                                                       config.getPageSize());
 
-            if (paginator.getPageCount() > config.getEnableSearchLimit()) {
+            if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                || (yearValue != null) || !(yearValue.trim().isEmpty())
+                || (titleValue != null) || !(titleValue.trim().isEmpty())
+                || (authorValue != null) || !(authorValue.trim().isEmpty())) {
                 yearFilter.generateXml(filtersElem);
                 titleFilter.generateXml(filtersElem);
                 authorFilter.generateXml(filtersElem);
@@ -185,18 +203,18 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
             paginator.generateXml(depPublicationsElem);
         }
 
-        final Element sortFieldsElem = depPublicationsElem.newChildElement(
-                "sortFields");
+        /*final Element sortFieldsElem = depPublicationsElem.newChildElement(
+        "sortFields");
         sortFieldsElem.addAttribute("sortBy", sortValue);
-
+        
         sortFieldsElem.newChildElement("sortField").addAttribute("label",
-                                                                 SORT_BY_AUTHOR);
+        SORT_BY_AUTHOR);
         sortFieldsElem.newChildElement("sortField").addAttribute("label",
-                                                                 SORT_BY_TITLE);
+        SORT_BY_TITLE);
         sortFieldsElem.newChildElement("sortField").addAttribute("label",
-                                                                 SORT_BY_YEAR_ASC);
+        SORT_BY_YEAR_ASC);
         sortFieldsElem.newChildElement("sortField").addAttribute("label",
-                                                                 SORT_BY_YEAR_DESC);
+        SORT_BY_YEAR_DESC);*/
 
         while (publications.next()) {
             generatePublicationXml(
@@ -236,7 +254,8 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
                     retrieveQuery(
                     "com.arsdigita.cms.contenttypes.getIdsOfPublicationsForOrgaUnit");
         }
-        final StringBuffer publicationsFilter = new StringBuffer();
+        //final StringBuffer publicationsFilter = new StringBuffer();
+        final List<String> orgaunitIds = new ArrayList<String>();
 
         if (config.isMergingPublications()) {
             final DataQuery subDepartmentsQuery =
@@ -247,19 +266,22 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
             subDepartmentsQuery.setParameter("assocType",
                                              SciDepartmentSubDepartmentsStep.ASSOC_TYPE);
             while (subDepartmentsQuery.next()) {
-                if (publicationsFilter.length() > 0) {
-                    publicationsFilter.append(" or ");
+                /*if (publicationsFilter.length() > 0) {
+                publicationsFilter.append(" or ");
                 }
                 publicationsFilter.append(String.format("orgaunitId = %s",
-                                                        subDepartmentsQuery.get(
-                        "orgaunitId").toString()));
+                subDepartmentsQuery.get(
+                "orgaunitId").toString()));*/
+                orgaunitIds.add(subDepartmentsQuery.get("orgaunitId").toString());
             }
         } else {
-            publicationsFilter.append(String.format("orgaunitId = %s",
-                                                    orgaunit.getID().toString()));
+            //publicationsFilter.append(String.format("orgaunitId = %s",
+            //                                      orgaunit.getID().toString()));
+            orgaunitIds.add(orgaunit.getID().toString());
         }
 
-        publicationsQuery.addFilter(publicationsFilter.toString());
+        //publicationsQuery.addFilter(publicationsFilter.toString());
+        publicationsQuery.setParameter("orgaunitIds", orgaunitIds);
 
         logger.debug(String.format(
                 "Got publications of department '%s'"
@@ -277,7 +299,10 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
             yearFilter.setValue(yearValue);
         }
 
-        publications.addFilter(yearFilter.getFilter());
+        if ((yearFilter.getFilter() != null)
+            && !(yearFilter.getFilter().isEmpty())) {
+            publications.addFilter(yearFilter.getFilter());
+        }
     }
 
     private void applyTitleFilter(final DataQuery publications,
@@ -287,7 +312,10 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
             titleFilter.setValue(titleValue);
         }
 
-        publications.addFilter(titleFilter.getFilter());
+        if ((titleFilter.getFilter() != null)
+            && !(titleFilter.getFilter().isEmpty())) {
+            publications.addFilter(titleFilter.getFilter());
+        }
     }
 
     private void applyAuthorFilter(final DataQuery publications,
@@ -297,7 +325,10 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
             authorFilter.setValue(authorValue);
         }
 
-        publications.addFilter(authorFilter.getFilter());
+        if ((authorFilter.getFilter() != null)
+            && !(authorFilter.getFilter().isEmpty())) {
+            publications.addFilter(authorFilter.getFilter());
+        }
     }
 
     private void generatePublicationXml(final BigDecimal publicationId,
@@ -319,6 +350,8 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
                                         final PageState state) {
         final long start = System.currentTimeMillis();
         final XmlGenerator generator = new XmlGenerator(publication);
+        generator.setUseExtraXml(false);
+        generator.setItemElemName("publication", "");
         generator.generateXML(state, parent, "");
         logger.debug(String.format(
                 "Generated XML for publication '%s' in %d ms.",
diff --git a/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl b/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
index 056ba1c77..d8d357828 100644
--- a/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
+++ b/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
@@ -30,9 +30,10 @@ query getIdsOfProjectsOfOrgaUnit {
     do {
         select distinct on (ct_sci_projects.project_id) ct_sci_projects.project_id, cms_pages.title, ct_sci_projects.projectbegin, ct_sci_projects.projectend, cms_organizationalunits_hierarchy_map.superior_orgaunit_id
         from ct_sci_projects
-        join cms_pages on ct_sci_project.project_id = cms_pages.item_id
-        join cms_organizationalunits_hierarchy_map on ct_sci_projects = cms_organizationalunits_hierarchy_map.subordinate_orgaunit_id
+        join cms_pages on ct_sci_projects.project_id = cms_pages.item_id
+        join cms_organizationalunits_hierarchy_map on ct_sci_projects.project_id = cms_organizationalunits_hierarchy_map.subordinate_orgaunit_id
         where cms_organizationalunits_hierarchy_map.assoc_type = 'ProjectOf'
+        and cms_organizationalunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds
     } map {
         projectId = ct_sci_projects.project_id;
         orgaunitId = cms_organizationalunits_hierarchy_map.superior_orgaunit_id;
diff --git a/ccm-sci-types-project/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml b/ccm-sci-types-project/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
index 7cd1dfae8..1a49ac7c3 100644
--- a/ccm-sci-types-project/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
+++ b/ccm-sci-types-project/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
@@ -13,8 +13,8 @@
                 <xrd:property name="/object/fundingVolume"/>
             </xrd:attributes>
             <xrd:associations rule="include">
-            <!--    <xrd:property name="/object/contacts"/>
-                <xrd:property name="/object/persons"/> -->
+            <!--    <xrd:property name="/object/contacts"/> -->
+                <xrd:property name="/object/persons"/>
             </xrd:associations>
         </xrd:adapter>
     </xrd:context>
diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java
index 24dbe72e9..745aff54f 100644
--- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java
+++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java
@@ -17,8 +17,10 @@ import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import org.apache.log4j.Logger;
 
@@ -101,24 +103,25 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab {
 
             if (project.getBegin() != null) {
                 final Element beginElem = lifeSpanElem.newChildElement("begin");
-                addDateAttributes(beginElem, project.getBegin());        
-                
+                addDateAttributes(beginElem, project.getBegin());
+
                 final Element beginSkipMonthElem = lifeSpanElem.newChildElement(
                         "beginSkipMonth");
-                beginSkipMonthElem.setText(project.getBeginSkipMonth().toString());
-                
+                beginSkipMonthElem.setText(
+                        project.getBeginSkipMonth().toString());
+
                 final Element beginSkipDayElem = lifeSpanElem.newChildElement(
                         "beginSkipDay");
                 beginSkipDayElem.setText(project.getBeginSkipDay().toString());
             }
-            if (project.getEnd() != null) {                
+            if (project.getEnd() != null) {
                 final Element endElem = lifeSpanElem.newChildElement("end");
                 addDateAttributes(endElem, project.getEnd());
-                
+
                 final Element endSkipMonthElem = lifeSpanElem.newChildElement(
                         "endSkipMonth");
                 endSkipMonthElem.setText(project.getEndSkipMonth().toString());
-                
+
                 final Element endSkipDayElem = lifeSpanElem.newChildElement(
                         "endSkipDay");
                 endSkipDayElem.setText(project.getEndSkipDay().toString());
@@ -196,16 +199,19 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab {
                     retrieveQuery(
                     "com.arsdigita.cms.contenttypes.getIdsOfMembersOfOrgaUnits");
 
-            final StringBuffer personsFilter = new StringBuffer();
+            //final StringBuffer personsFilter = new StringBuffer();
+            final List<String> projectIds = new ArrayList<String>();
             while (subProjectsQuery.next()) {
-                if (personsFilter.length() > 0) {
-                    personsFilter.append(" or ");
+                /*if (personsFilter.length() > 0) {
+                personsFilter.append(" or ");
                 }
                 personsFilter.append(String.format("orgaunitId = %s",
-                                                   subProjectsQuery.get(
-                        "orgaunitId").toString()));
+                subProjectsQuery.get(
+                "orgaunitId").toString()));*/
+                projectIds.add(subProjectsQuery.get("orgaunitId").toString());
             }
-            personsQuery.addFilter(personsFilter.toString());
+            //personsQuery.addFilter(personsFilter.toString());
+            personsQuery.setParameter("orgaunitIds", projectIds);
 
             personsQuery.addOrder(GenericPerson.SURNAME);
             personsQuery.addOrder(GenericPerson.GIVENNAME);
@@ -224,9 +230,9 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab {
             members.addOrder("givenname");
 
             while (members.next()) {
-                generateMemberXml(members.getPerson(), 
-                                  membersElem, 
-                                  members.getRoleName(), 
+                generateMemberXml(members.getPerson(),
+                                  membersElem,
+                                  members.getRoleName(),
                                   state);
             }
         }