From e3b2d9aa86d97154421e753d91856bc73a4be591 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Mon, 25 Jun 2012 22:10:31 +0530 Subject: Images.java && Links.java (bug fix) : regex modified to properly parse the respective mark-up when the marked-uped a a whole runs into more than one line. Before this modification the "marked-uped" lines which ran into two (or more) different lines were not properly parsed, by these parsers, and thus was not properly converted. With this fix, things _seem_ to work good. --- parsers/Links.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'parsers/Links.java') diff --git a/parsers/Links.java b/parsers/Links.java index caa258d..87e4109 100644 --- a/parsers/Links.java +++ b/parsers/Links.java @@ -3,13 +3,26 @@ package scruf.parsers; import java.util.regex.*; public class Links implements Parser { + // set of strings to build the html link + private String openTag = ""; + private String closeTag = ""; public String parse(String fileContent) { - Pattern pattern = Pattern.compile("\\[\\[(.+?)\\|(.+?)\\]\\]"); + Pattern pattern = Pattern.compile("\\[\\[(.+?)(\\|(.+?))\\]\\]", Pattern.DOTALL); Matcher matcher = pattern.matcher(fileContent); StringBuffer sbuffer = new StringBuffer(); - String replacementString = "$2"; + StringBuilder replacementString = new StringBuilder(); while(matcher.find()) { - matcher.appendReplacement(sbuffer,replacementString); + // delete text already there. + replacementString.delete(0,replacementString.length()); + // start the tag. + replacementString.append(openTag); + // add link name, if given + if(matcher.group(3)!=null) { + replacementString.append(matcher.group(3)); + } + // close the tag + replacementString.append(closeTag); + matcher.appendReplacement(sbuffer,replacementString.toString()); } matcher.appendTail(sbuffer); return sbuffer.toString(); -- cgit v1.2.3