Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rbdf79f0f0738a7df371d604fef94ee7015b37aec -rb6c2c2e56b1dbcc7e995976be7b57bd2475cbeff Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java =================================================================== diff -u -r0df1c403ef3f6ce1360f852afd55ae847409f65a -rb6c2c2e56b1dbcc7e995976be7b57bd2475cbeff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningLibraryDAO.java (.../ILearningLibraryDAO.java) (revision b6c2c2e56b1dbcc7e995976be7b57bd2475cbeff) @@ -33,7 +33,7 @@ public interface ILearningLibraryDAO extends IBaseDAO { public LearningLibrary getLearningLibraryById(Long learningLibraryId); - public LearningLibrary getLearningLibraryByTitle(String title); + /** Get all valid learning libraries */ public List getAllLearningLibraries(); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java =================================================================== diff -u -r0df1c403ef3f6ce1360f852afd55ae847409f65a -rb6c2c2e56b1dbcc7e995976be7b57bd2475cbeff --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 0df1c403ef3f6ce1360f852afd55ae847409f65a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision b6c2c2e56b1dbcc7e995976be7b57bd2475cbeff) @@ -25,6 +25,7 @@ import java.util.List; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; @@ -33,6 +34,9 @@ */ public class LearningLibraryDAO extends BaseDAO implements ILearningLibraryDAO { + private static final String FIND_VALID_LIB ="from "+LearningLibrary.class.getName() + +" l where l.validLibrary=true"; + /** * (non-Javadoc) * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.ILearningLibraryDAO#getLearningLibraryById(java.lang.Long) @@ -43,17 +47,9 @@ /** * (non-Javadoc) - * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.ILearningLibraryDAO#getLearningLibraryByTitle(java.lang.String) - */ - public LearningLibrary getLearningLibraryByTitle(String title) { - return (LearningLibrary)super.find(LearningLibrary.class,title); - } - - /** - * (non-Javadoc) * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.ILearningLibraryDAO#getAllLearningLibraries() */ public List getAllLearningLibraries() { - return super.findAll(LearningLibrary.class); + return getSession().createQuery(FIND_VALID_LIB).list(); } }