Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
08/06/08 17:17:55 (5 months ago)
Author:
mseaton
Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernatePersonDAO.java

    r4969 r5183  
    2626import org.hibernate.criterion.MatchMode; 
    2727import org.hibernate.criterion.Order; 
    28 import org.openmrs.Drug; 
     28import org.hibernate.criterion.Projections; 
     29import org.hibernate.criterion.Restrictions; 
    2930import org.hibernate.type.StringType; 
     31import org.hibernate.type.Type; 
    3032import org.openmrs.Person; 
    3133import org.openmrs.PersonAddress; 
    …… 
    215217                                 
    216218                criteria.add(Expression.eq("personVoided", false)); 
    217                  
    218219                if (dead != null) 
    219                         criteria.add(Expression.eq("dead", dead)); 
    220                  
     220                        criteria.add(Expression.eq("dead", dead));               
    221221                criteria.addOrder(Order.asc("personId")); 
    222                  
     222                criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); 
    223223                return criteria.list(); 
    224224        } 
    …… 
    377377    public List<RelationshipType> getRelationshipTypes(String relationshipTypeName, Boolean preferred) throws DAOException { 
    378378                 
    379                 Criteria criteria = sessionFactory.getCurrentSession().createCriteria(RelationshipType.class, "t"); 
    380                 criteria.add(Expression.eq("retired", false)); 
    381                 criteria.add(Expression.sql("CONCAT(t.aIsToB, CONCAT('/', t.bIsToA))", relationshipTypeName, new StringType())); 
     379                Criteria criteria = sessionFactory.getCurrentSession().createCriteria(RelationshipType.class); 
     380                criteria.add(Restrictions.sqlRestriction("CONCAT(a_Is_To_B, CONCAT('/', b_Is_To_A)) like (?)", relationshipTypeName, new StringType())); 
    382381         
    383382                if (preferred != null) 
    …… 
    389388        /** 
    390389         * @see org.openmrs.api.PatientService#getRelationshipTypes() 
    391          * @see org.openmrs.api.db.PersonDAO#getAllRelationshipTypes(boolean) 
     390         * @see org.openmrs.api.db.PersonDAO#getAllRelationshipTypes() 
    392391         */ 
    393392        @SuppressWarnings("unchecked") 
    394         public List<RelationshipType> getAllRelationshipTypes(boolean includeRetired) throws DAOException { 
     393        public List<RelationshipType> getAllRelationshipTypes() throws DAOException { 
    395394                 
    396395                Criteria criteria = sessionFactory.getCurrentSession().createCriteria(RelationshipType.class, "t"); 
    397396                 
    398                 if (!includeRetired) 
    399                         criteria.add(Expression.eq("retired", false)); 
     397                /**if (!includeRetired) 
     398                        criteria.add(Expression.eq("retired", false));*/ 
    400399                 
    401400                criteria.addOrder(Order.asc("weight"));