cvs commit: jahia/core/src/java/org/jahia/engines/importexport ManageContentPicker.java

[Thomas Draier]

tdraier     2005/10/10 17:34:00 CEST

  Modified files:
    core/src/java/org/jahia/engines/importexport 
                                                 ManageContentPicker.java 
  Log:
  fixed empty teaser
  
  Revision  Changes    Path
  1.35      +21 -8     
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.34&r2=1.35&f=h
  
  
  
  Index: ManageContentPicker.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ManageContentPicker.java  10 Oct 2005 08:42:28 -0000      1.34
  +++ ManageContentPicker.java  10 Oct 2005 15:34:00 -0000      1.35
  @@ -35,7 +35,7 @@
    *
    * @author Thomas Draier, joe Pillot
    * @author ${User}
  - * @version $Id: ManageContentPicker.java,v 1.34 2005/10/10 08:42:28 knguyen 
Exp $
  + * @version $Id: ManageContentPicker.java,v 1.35 2005/10/10 15:34:00 tdraier 
Exp $
    */
   public class ManageContentPicker {
       private static org.apache.log4j.Logger logger =
  @@ -312,17 +312,27 @@
                               logger.debug("found compatible?" + key);
                               String t = key;
                               List l = contentContainer.getChilds(null, lr, 
null);
  -                            if (!l.isEmpty()) {
  -                                t = ((ContentField) 
l.iterator().next()).getValue(processingContext, lr);
  -                                logger.debug("tkey=" + t);
  +
  +                            for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
  +                                ContentField contentField = (ContentField) 
iterator1.next();
  +                                String value = 
contentField.getValue(processingContext, lr);
  +                                if (value != null && 
!value.trim().equals("") && !value.equals("<empty>")) {
  +                                    t = value;
  +                                    logger.debug("tkey=" + t);
  +                                    break;
  +                                }
                               }
  +
                               for (Iterator iterator1 = l.iterator(); 
iterator1.hasNext();) {
                                   ContentField contentField = (ContentField) 
iterator1.next();
                                   if (contentField instanceof 
ContentSmallTextField) {
  -                                    t = 
contentField.getValue(processingContext, lr);
  -                                    pageID = contentField.getPageID();
  -                                    logger.debug("smalltext:" + t + " 
pageID" + pageID);
  -                                    break;
  +                                    String value = 
contentField.getValue(processingContext, lr);
  +                                    if (value != null && 
!value.trim().equals("") && !value.equals("<empty>")) {
  +                                        t = value;
  +                                        pageID = contentField.getPageID();
  +                                        logger.debug("smalltext:" + t + " 
pageID" + pageID);
  +                                        break;
  +                                    }
                                   }
                               }
   
  @@ -526,6 +536,9 @@
   }
   /**
    * $Log: ManageContentPicker.java,v $
  + * Revision 1.35  2005/10/10 15:34:00  tdraier
  + * fixed empty teaser
  + *
    * Revision 1.34  2005/10/10 08:42:28  knguyen
    * - check for npe & metadata case sensitive
    *