cvs commit: jahia/core/src/java/org/jahia/data/fields JahiaFloatField.java JahiaIntegerField.java

[Serge Huber]

shuber      2005/09/02 15:34:42 CEST

  Modified files:
    core/src/java/org/jahia/data/fields JahiaFloatField.java 
                                        JahiaIntegerField.java 
  Log:
  Fix for JAHIA-337 contributed by Benjamin Papez, thanks.
  http://www.jahia.org/jira/browse/JAHIA-337
  
  Revision  Changes    Path
  1.5       +6 -2      
jahia/core/src/java/org/jahia/data/fields/JahiaFloatField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/fields/JahiaFloatField.java.diff?r1=1.4&r2=1.5&f=h
  1.6       +6 -2      
jahia/core/src/java/org/jahia/data/fields/JahiaIntegerField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/fields/JahiaIntegerField.java.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: JahiaFloatField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/fields/JahiaFloatField.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JahiaFloatField.java      5 Jul 2005 15:46:01 -0000       1.4
  +++ JahiaFloatField.java      2 Sep 2005 13:34:42 -0000       1.5
  @@ -111,8 +111,12 @@
               return true;
           }
           try {
  -            
contentField.setFloat((Float.valueOf(getValue())).floatValue(),saveRequest);
  -            
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(),true, 
jParams);
  +            if (!"<empty>".equals(getValue()) && getValue().length() > 0){   
       
  +                
contentField.setFloat(Float.valueOf(getValue()).floatValue(), saveRequest);
  +                
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams);
  +            } else {
  +                return false;
  +            }
           } catch ( Throwable t ){
               t.printStackTrace();
               return false;
  
  
  
  Index: JahiaIntegerField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/fields/JahiaIntegerField.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JahiaIntegerField.java    5 Jul 2005 15:46:01 -0000       1.5
  +++ JahiaIntegerField.java    2 Sep 2005 13:34:42 -0000       1.6
  @@ -115,8 +115,12 @@
               return true;
           }*/
           try {
  -            
contentField.setInteger((Integer.valueOf(getValue())).intValue(),saveRequest);
  -            
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(),true, 
jParams);
  +            if (!"<empty>".equals(getValue()) && getValue().length() > 0){
  +             
contentField.setInteger((Integer.valueOf(getValue())).intValue(),saveRequest);  
        
  +                
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams);              
  +            } else {
  +                return false;
  +            } 
           } catch ( Throwable t ){
               t.printStackTrace();
               return false;