cvs commit: jahia/core/src/java/org/jahia/services/webdav JahiaWebdavBaseService.java

[Thomas Draier]

tdraier     2004/11/12 12:23:44 CET

  Modified files:
    core/src/java/org/jahia/services/webdav 
                                            JahiaWebdavBaseService.java 
  Log:
  fixed postgres issue with comparaison operator
  
  Revision  Changes    Path
  1.7       +2 -4      
jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: JahiaWebdavBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JahiaWebdavBaseService.java       17 Sep 2004 10:14:51 -0000      1.6
  +++ JahiaWebdavBaseService.java       12 Nov 2004 11:23:44 -0000      1.7
  @@ -446,16 +446,14 @@
           try {
               Connection connection = ConnectionDispenser.getConnection ();
               String sql = "select 
ID_JAHIA_FIELDS_DATA,VERSION_ID,WORKFLOW_STATE,LANGUAGE_CODE,value_jahia_fields_data
 from jahia_fields_data, jahia_fields_def WHERE 
fielddefid_jahia_fields_data=id_jahia_fields_def and jahiaid_jahia_fields_def=? 
and (value_jahia_fields_data like ? or value_jahia_fields_data like ?) and 
type_jahia_fields_data=" +
  -                    ContentFieldTypes.FILE + " and 
workflow_state!="+EntryLoadRequest.DELETED_WORKFLOW_STATE;
  +                    ContentFieldTypes.FILE + " and 
workflow_state<>"+EntryLoadRequest.DELETED_WORKFLOW_STATE;
   //            String sql = "select 
ID_JAHIA_FIELDS_DATA,VERSION_ID,WORKFLOW_STATE,LANGUAGE_CODE,value_jahia_fields_data
 from jahia_fields_data WHERE (value_jahia_fields_data like ? or 
value_jahia_fields_data like ?) and 
type_jahia_fields_data="+ContentFieldTypes.FILE;
               if (onlyLockedUsages) {
                   sql += " and (workflow_state=" +
                           EntryLoadRequest.WAITING_WORKFLOW_STATE +
                           " or workflow_state=" +
                           EntryLoadRequest.ACTIVE_WORKFLOW_STATE + ")";
  -            } else {
  -                sql += " and 
workflow_state!="+EntryLoadRequest.DELETED_WORKFLOW_STATE;
  -            }
  +            } 
   
               PreparedStatement statement = connection.prepareStatement (sql);
               statement.setInt (1, siteId);