diff --git podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java index f524682..1255125 100644 --- podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java +++ podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java @@ -641,13 +641,7 @@ public class BasicPodfeedService implements PodfeedService { podcastMap.put("guid", fileUrl); final String podcastFolderId = podcastService.retrievePodcastFolderId(siteId); securityService.clearAdvisors(); - - // if site Display to Site, need to access actual podcasts thru Dav servlet - // so change item URLs to do so - if (!podcastService.isPublic(podcastFolderId)) { - fileUrl = convertToDavUrl(fileUrl); - } - + podcastMap.put("url", fileUrl); podcastMap.put("description",podcastProperties.getPropertyFormatted(ResourceProperties.PROP_DESCRIPTION)); podcastMap.put("author", podcastProperties.getPropertyFormatted(ResourceProperties.PROP_CREATOR)); @@ -867,28 +861,6 @@ public class BasicPodfeedService implements PodfeedService { } /** - * If site is Display to Site, need to retrieve files thru dav servlet. - * This converts a podcast URL to accomplish this. - * - * @param fileUrl - * The current file URL. Access is through content. - * - * @return String - * The changed URL that points to the dav servlet. - */ - private String convertToDavUrl(String fileUrl) { - // Compile regular expression - Pattern pattern = Pattern.compile("access/content/group"); - - // Replace all occurrences of pattern in input - Matcher matcher = pattern.matcher(fileUrl); - fileUrl = matcher.replaceAll("dav"); - - return fileUrl; - - } - - /** * Determines if authenticated user has 'read' access to podcast collection folder * * @param id