Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	25 Jul 2006 07:12:35 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java	1 Aug 2006 03:50:00 -0000	1.2
@@ -33,8 +33,12 @@
 
 	void saveOrUpdate(NotebookEntry nb);
 
-	List get(String id, Long idType, Long userID);
-
 	NotebookEntry get(Long uid);
 
+	List<NotebookEntry> get(Integer userID);
+
+	List<NotebookEntry> get(Integer userID, Long lessonID);
+
+	List<NotebookEntry> get(String id, Long idType, String signature,
+			Integer userID);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	1 Aug 2006 00:32:36 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	1 Aug 2006 03:50:00 -0000	1.4
@@ -36,13 +36,16 @@
 	public static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID = "from " + NotebookEntry.class.getName() 
 							+ " where external_id=? and external_id_type=? and user_id=?";
 	
+	public static final String SQL_QUERY_FIND_ENTRY_BY_USER_ID = "from " + NotebookEntry.class.getName() 
+							+ " where user_id=?";
+	
 	public void saveOrUpdate(NotebookEntry notebookEntry) {
 		this.getHibernateTemplate().saveOrUpdate(notebookEntry);
 		this.getHibernateTemplate().flush();
 	}
 
-	public List get(String id, Long idType, Long userID) {
-		return getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, userID});
+	public List<NotebookEntry> get(String id, Long idType, String signature, Integer userID) {
+		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, signature, userID}));
 	}
 
 	public NotebookEntry get(Long uid) {
@@ -53,4 +56,13 @@
 			return null;
 		}
 	}
+
+	public List<NotebookEntry> get(Integer userID) {
+		return (List<NotebookEntry>)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_USER_ID, userID));
+	}
+
+	public List<NotebookEntry> get(Integer userID, Long lessonID) {
+		// TODO need to write hql query for lessionID and userID
+		return null;
+	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	1 Aug 2006 00:30:37 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java	1 Aug 2006 03:50:00 -0000	1.4
@@ -36,7 +36,7 @@
 import org.lamsfoundation.lams.util.MessageService;
 
 
-public class CoreNotebookService implements ICoreNotebookService {
+public class CoreNotebookService implements ICoreNotebookService, IExtendedCoreNotebookService{
 
 	private static Logger log = Logger.getLogger(CoreNotebookService.class);
 
@@ -53,16 +53,18 @@
 		return notebookEntry.getUid();
 	}
 
-	public List<NotebookEntry> getEntry(String id, Long idType, Long userID) {
-		List list = notebookEntryDAO.get(id, idType, userID);
-		List<NotebookEntry> notebookEntries = new ArrayList<NotebookEntry>();
-		for (Iterator iter = list.iterator(); iter.hasNext();) {
-			NotebookEntry element = (NotebookEntry) iter.next();
-			notebookEntries.add(element);
-		}
-		return notebookEntries;
+	public List<NotebookEntry> getEntry(String id, Long idType, String signature, Integer userID) {
+		return notebookEntryDAO.get(id, idType, signature, userID);
 	}
 
+	public List<NotebookEntry> getEntry(Integer userID) {
+		return notebookEntryDAO.get(userID);
+	}
+
+	public List<NotebookEntry> getEntry(Integer userID, Long lessonID) {
+		return notebookEntryDAO.get(userID, lessonID);		
+	}
+	
 	public NotebookEntry getEntry(Long uid) {
 		return notebookEntryDAO.get(uid);
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	31 Jul 2006 07:44:42 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java	1 Aug 2006 03:50:00 -0000	1.3
@@ -35,7 +35,7 @@
 	Long createNotebookEntry(Long id, Integer idType, String signature,
 			Integer userID, String title, String entry);
 
-	List<NotebookEntry> getEntry(String id, Long idType, Long userID);
+	List<NotebookEntry> getEntry(String id, Long idType, String signature, Integer userID);
 	
 	NotebookEntry getEntry(Long uid);