Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java =================================================================== diff -u -rbec4861a186a6a8972771f054c3fa1fb0f51da72 -rbf056a02a2a88f9ad3fed8162f183ada802a695d --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision bec4861a186a6a8972771f054c3fa1fb0f51da72) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision bf056a02a2a88f9ad3fed8162f183ada802a695d) @@ -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 =================================================================== diff -u -rd64a81769de37acdf103017a62cb0e2a46f7a774 -rbf056a02a2a88f9ad3fed8162f183ada802a695d --- lams_tool_wiki/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision d64a81769de37acdf103017a62cb0e2a46f7a774) +++ lams_tool_wiki/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision bf056a02a2a88f9ad3fed8162f183ada802a695d) @@ -91,9 +91,6 @@ ${wikiPage.title} - - -