Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java 6 Jun 2008 00:24:19 -0000 1.2 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java 7 Jul 2008 23:49:59 -0000 1.3 @@ -60,7 +60,7 @@ private Gmap gmap; - private Set gmapUsers; + private Set gmapUsers; // Constructors @@ -181,7 +181,7 @@ * */ - public Set getGmapUsers() { + public Set getGmapUsers() { return this.gmapUsers; } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java,v diff -u -r1.4 -r1.5 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java 4 Jul 2008 02:36:04 -0000 1.4 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java 7 Jul 2008 23:49:59 -0000 1.5 @@ -134,27 +134,18 @@ UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); GmapUser gmapUser = gmapService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),toolSessionID); + GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser); + request.getSession().setAttribute("userDTO", gmapUserDTO); + - //NotebookEntry gmapEntry = gmapService.getEntry(gmapUser.getEntryUID()); - // construct dto's GmapDTO gmapDTO = new GmapDTO(gmap); - //GmapDTO gmapDTO = new GmapDTO(); - //gmapDTO.setTitle(gmap.getTitle()); - //gmapDTO.setInstructions(gmap.getInstructions()); + gmapDTO.setGmapMarkers(gmapService.getGmapMarkersBySessionId(toolSessionID)); + - GmapSessionDTO sessionDTO = new GmapSessionDTO(); - sessionDTO.setSessionName(gmapSession.getSessionName()); - sessionDTO.setSessionID(gmapSession.getSessionId()); - sessionDTO.setUserDTOs(gmapSession.getGmapUsers()); - - // If the user hasn't put in their entry yet, gmapEntry will be null; - //GmapUserDTO userDTO = gmapEntry != null ? new GmapUserDTO(gmapUser,gmapEntry) : new GmapUserDTO(gmapUser); - - //GmapUserDTO userDTO = new GmapUserDTO(gmapUser); + GmapSessionDTO sessionDTO = new GmapSessionDTO(gmapSession); + request.getSession().setAttribute("sessionDTO", sessionDTO); - - //sessionDTO.getUserDTOs().add(userDTO); gmapDTO.getSessionDTOs().add(sessionDTO); request.getSession().setAttribute("gmapDTO", gmapDTO); @@ -179,17 +170,10 @@ GmapDTO gmapDTO = new GmapDTO(gmap); - // add the gmapEntry for each user in each session - /* - for (GmapSessionDTO session : gmapDTO.getSessionDTOs()) { - for (GmapUserDTO user : session.getUserDTOs()) { - NotebookEntry entry = gmapService.getEntry(user.getEntryUID()); - if (entry != null) { - NotebookEntryDTO entryDTO = new NotebookEntryDTO(entry); - user.setEntryDTO(entryDTO); - } - } - }*/ + for (GmapSessionDTO gmapSessionDTO : gmapDTO.getSessionDTOs() ) + { + gmapSessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(gmapSessionDTO.getSessionID())); + } request.getSession().setAttribute("gmapDTO", gmapDTO); }