Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -r19150ba35226fd786e2cd009c05bd9d940118e95 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision fe06d16b234341fc965d9b40494e6a2fb4cb9438) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 19150ba35226fd786e2cd009c05bd9d940118e95) @@ -1912,7 +1912,8 @@ String newName = originalTitle; if (workspaceFolderId != null) { - List ldTitleList = learningDesignDAO.getLearningDesignTitlesByWorkspaceFolder(workspaceFolderId); + List ldTitleList = learningDesignDAO.getLearningDesignTitlesByWorkspaceFolder(workspaceFolderId, + originalTitle); int idx = 1; Calendar calendar = Calendar.getInstance(); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java =================================================================== diff -u -r035853516626933d59e2473b4410b1dc54bb023e -r19150ba35226fd786e2cd009c05bd9d940118e95 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision 035853516626933d59e2473b4410b1dc54bb023e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (.../ILearningDesignDAO.java) (revision 19150ba35226fd786e2cd009c05bd9d940118e95) @@ -87,12 +87,9 @@ public List getLearningDesignsByOriginalDesign(Long originalDesignID); /** - * Get the titles of all the learning designs in the given folder. - * @param workspaceFolderID The workspace_folder_id of the WorkspaceFolder - * from where the designs have to be fetched. - * @return List The List of titles + * Get the titles of all the learning designs with the given prefix in the given folder. */ - public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID); + public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix); public List getAccessByUser(Integer userId); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r19150ba35226fd786e2cd009c05bd9d940118e95 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 19150ba35226fd786e2cd009c05bd9d940118e95) @@ -48,7 +48,7 @@ private static final String FIND_BY_ORIGINAL ="from " + TABLENAME +" in class " + LearningDesign.class.getName()+ " where original_learning_design_id=?"; private static final String FIND_LD_NAMES_IN_FOLDER = "select title from " + LearningDesign.class.getName()+ - " where workspace_folder_id=?"; + " where workspace_folder_id=? and title like ?"; private static final String ACCESS_BY_USER = "from " + LearningDesignAccess.class.getName() + " as a where a.userId = ? order by a.accessDate desc"; @@ -114,8 +114,9 @@ * (non-Javadoc) * @see org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO#getLearningDesignTitlesByWorkspaceFolder(java.lang.Integer) */ - public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID){ - return this.getHibernateTemplate().find(FIND_LD_NAMES_IN_FOLDER,workspaceFolderID); + public List getLearningDesignTitlesByWorkspaceFolder(Integer workspaceFolderID, String prefix){ + return this.getHibernateTemplate().find(FIND_LD_NAMES_IN_FOLDER, + new Object[] { workspaceFolderID, prefix + "%" }); } @SuppressWarnings("unchecked")