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

[Serge Huber]

shuber      2005/09/02 15:30:53 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    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.24.4.1.2.2  +6 -2      
jahia/src/java/org/jahia/data/fields/JahiaFloatField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/fields/JahiaFloatField.java.diff?r1=1.24.4.1.2.1&r2=1.24.4.1.2.2&f=h
  1.24.4.1.2.2  +6 -2      
jahia/src/java/org/jahia/data/fields/JahiaIntegerField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/fields/JahiaIntegerField.java.diff?r1=1.24.4.1.2.1&r2=1.24.4.1.2.2&f=h
  
  
  
  Index: JahiaFloatField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/fields/Attic/JahiaFloatField.java,v
  retrieving revision 1.24.4.1.2.1
  retrieving revision 1.24.4.1.2.2
  diff -u -r1.24.4.1.2.1 -r1.24.4.1.2.2
  --- JahiaFloatField.java      24 May 2005 18:12:58 -0000      1.24.4.1.2.1
  +++ JahiaFloatField.java      2 Sep 2005 13:30:53 -0000       1.24.4.1.2.2
  @@ -107,8 +107,12 @@
           EntrySaveRequest saveRequest = new 
EntrySaveRequest(jParams.getUser(),getLanguageCode());
           ContentFloatField contentField = 
(ContentFloatField)ContentField.getField(getID());
           try {
  -            
contentField.setFloat((Float.valueOf(getValue())).floatValue(),saveRequest);
  -            
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams, true);
  +            if (!"<empty>".equals(getValue()) && getValue().length() > 0){   
       
  +                
contentField.setFloat(Float.valueOf(getValue()).floatValue(), saveRequest);
  +                
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams, true);
  +            } else {
  +                return false;
  +            }
           } catch ( Throwable t ){
               t.printStackTrace();
               return false;
  
  
  
  Index: JahiaIntegerField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/fields/Attic/JahiaIntegerField.java,v
  retrieving revision 1.24.4.1.2.1
  retrieving revision 1.24.4.1.2.2
  diff -u -r1.24.4.1.2.1 -r1.24.4.1.2.2
  --- JahiaIntegerField.java    24 May 2005 18:12:58 -0000      1.24.4.1.2.1
  +++ JahiaIntegerField.java    2 Sep 2005 13:30:53 -0000       1.24.4.1.2.2
  @@ -110,8 +110,12 @@
           EntrySaveRequest saveRequest = new 
EntrySaveRequest(jParams.getUser(),getLanguageCode());
           ContentIntegerField contentField = 
(ContentIntegerField)ContentField.getField(getID());
           try {
  -            
contentField.setInteger((Integer.valueOf(getValue())).intValue(),saveRequest);
  -            
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams, true);
  +            if (!"<empty>".equals(getValue()) && getValue().length() > 0){
  +             
contentField.setInteger((Integer.valueOf(getValue())).intValue(),saveRequest);  
        
  +                
ServicesRegistry.getInstance().getJahiaSearchService().indexField(getID(), 
true, jParams, true);              
  +            } else {
  +              return false;
  +            } 
           } catch ( Throwable t ){
               t.printStackTrace();
               return false;