Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java,v diff -u -r1.8 -r1.9 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java 15 Oct 2008 05:21:17 -0000 1.8 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java 31 Oct 2008 00:03:54 -0000 1.9 @@ -180,7 +180,7 @@ // Update image links WikiPageContentDTO contentDTO = wikiPageDTO.getCurrentWikiContentDTO(); - contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID())); + contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID(),getLamsOrRamsContext(request))); wikiPageDTO.setCurrentWikiContentDTO(contentDTO); wikiPageDTOs.add(wikiPageDTO); @@ -281,7 +281,7 @@ // Update image links WikiPageContentDTO contentDTO = wikiPageDTO.getCurrentWikiContentDTO(); - contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID())); + contentDTO.setBody(replaceImageFolderLinks(contentDTO.getBody(), wikiSession.getContentFolderID(), getLamsOrRamsContext(request))); wikiPageDTO.setCurrentWikiContentDTO(contentDTO); wikiPageDTOs.add(wikiPageDTO); @@ -307,7 +307,6 @@ // Set the mode request.getSession().setAttribute(WikiConstants.ATTR_MODE, ToolAccessMode.TEACHER); - } } @@ -318,12 +317,13 @@ * @param contentFolderID * @return */ - private String replaceImageFolderLinks(String body, String contentFolderID) { - String fckeditorpath = "/rams//www/secure/" + contentFolderID; - String fckeditorsmiley = "/rams//fckeditor/editor/images/smiley"; - + private String replaceImageFolderLinks(String body, String contentFolderID, String lamsOrRams) { + String fckeditorpath = lamsOrRams + "//www/secure/" + contentFolderID; String newfckeditorpath = "./" + contentFolderID; + + String fckeditorsmiley = lamsOrRams + "//fckeditor/editor/images/smiley"; String newfckeditorsmiley = "./fckeditor/editor/images/smiley"; + // The pattern matches control characters Pattern p = Pattern.compile(fckeditorpath); @@ -341,5 +341,14 @@ return result; } + + /** + * Returns "/rams" if we are running rams and "/lams" if we are running lams + * @return + */ + private String getLamsOrRamsContext(HttpServletRequest request) + { + return request.getContextPath().substring(0, 5); + } } Index: lams_tool_wiki/web/pages/export/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/export/exportPortfolio.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_wiki/web/pages/export/exportPortfolio.jsp 14 Oct 2008 04:14:07 -0000 1.3 +++ lams_tool_wiki/web/pages/export/exportPortfolio.jsp 31 Oct 2008 00:03:54 -0000 1.4 @@ -91,9 +91,6 @@ ${wikiPage.title} - - -