Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v diff -u -r1.107 -r1.107.2.1 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 20 Jun 2014 17:35:08 -0000 1.107 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 3 Sep 2014 07:27:42 -0000 1.107.2.1 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java,v diff -u -r1.13 -r1.13.2.1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java 21 Apr 2014 09:57:58 -0000 1.13 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java 3 Sep 2014 07:27:43 -0000 1.13.2.1 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java,v diff -u -r1.14.2.2 -r1.14.2.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java 15 Aug 2014 09:59:09 -0000 1.14.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java 3 Sep 2014 07:27:43 -0000 1.14.2.3 @@ -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")