Verschiedene Korrekturen zur Verbesserung der Suchergebnisse

git-svn-id: https://svn.libreccm.org/ccm/trunk@1430 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java

@@ -247,4 +247,9 @@ public class GenericOrganizationalUnit extends ContentPage {
     public boolean hasSubordinateOrgaUnits() {
         return !getSubordinateOrgaUnits().isEmpty();
     }
+    
+    @Override
+    public String getSearchSummary() {
+        return String.format("%s %s", getTitle(), getAddendum());
+    }
 }

ccm-cms/src/com/arsdigita/cms/contenttypes/GenericPerson.java

@@ -306,4 +306,9 @@ public class GenericPerson extends ContentPage implements
     public String getRelationAttributeKey(String propertyName) {
         return null;
     }
+    
+    @Override
+    public String getSearchSummary() {
+        return getFullName();
+    }
 }

ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java

@@ -7,6 +7,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit;
 import com.arsdigita.cms.contenttypes.ui.GenericOrgaUnitTab;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.navigation.ui.AbstractComponent;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.UncheckedWrapperException;
@@ -60,6 +61,13 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent {
         GenericOrganizationalUnit orgaunit =
                                   (GenericOrganizationalUnit) DomainObjectFactory.
                 newInstance(orgaunitOid);
+
+        if (!(orgaunit.getLanguage().equals(GlobalizationHelper.
+              getNegotiatedLocale().getLanguage()))) {
+            orgaunit = (GenericOrganizationalUnit) orgaunit.getContentBundle().
+                    getInstance(GlobalizationHelper.getNegotiatedLocale());
+        }
+
         if ((DispatcherHelper.getDispatcherPrefix(request) == null)
             || !DispatcherHelper.getDispatcherPrefix(request).equals("preview")) {
             orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion();
@@ -67,7 +75,9 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent {
 
         final Element contentPanelElem = new Element("cms:contentPanel",
                                                      CMS.CMS_XML_NS);
-        final Element cmsItemElem = contentPanelElem.newChildElement("cms:item", CMS.CMS_XML_NS);
+        final Element cmsItemElem =
+                      contentPanelElem.newChildElement("cms:item",
+                                                       CMS.CMS_XML_NS);
         cmsItemElem.addAttribute("oid", orgaunitOid.toString());
         final Element objTypeElem = cmsItemElem.newChildElement("objectType");
         objTypeElem.setText(orgaunit.getClass().getName());

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Publication.java

@@ -318,4 +318,12 @@ public class Publication extends ContentPage {
         generators.add(new SciPublicationExtraXmlGenerator());
         return generators;
     }
+
+    @Override
+    public String getSearchSummary() {
+        return String.format("%s %s %s", 
+                             getTitle(),
+                             getAuthors(),
+                             getAbstract());
+    }
 }

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/SciDepartment.java

@@ -230,4 +230,9 @@ public class SciDepartment extends GenericOrganizationalUnit {
         generators.add(new SciDepartmentExtraXmlGenerator());
         return generators;
     }
+    
+    @Override
+    public String getSearchSummary() {
+        return getDepartmentShortDescription();
+    }
 }

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/SciInstitute.java

@@ -237,4 +237,9 @@ public class SciInstitute extends GenericOrganizationalUnit {
         generators.add(new SciInstituteExtraXmlGenerator());
         return generators;
     }
+    
+    @Override
+    public String getSearchSummary() {
+        return getInstituteShortDescription();
+    }
 }

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProject.java

@@ -366,4 +366,9 @@ public class SciProject extends GenericOrganizationalUnit {
         generators.add(new SciProjectExtraXmlGenerator());
         return generators;
     }
+
+    @Override
+    public String getSearchSummary() {
+        return getProjectShortDescription();
+    }
 }