--- xwiki/core/src/test/java/com/xpn/xwiki/content/parsers/LinkParserTest.java	Wed Mar 28 19:27:26 CEST 2007
+++ xwiki/core/src/test/java/com/xpn/xwiki/content/parsers/LinkParserTest.java	Wed Mar 28 19:27:26 CEST 2007
@@ -29,7 +29,7 @@
  */
 public class LinkParserTest extends TestCase
 {
-    public void testParseAliasWhenOnlyReferenceIsSpecified()
+    public void testParseAliasWhenOnlyReferenceIsSpecified() throws Exception
     {
         LinkParser parser = new LinkParser();
         Link link = new Link();
@@ -41,7 +41,7 @@
         assertEquals("reference", sb.toString());
     }
 
-    public void testParseAliasWhenValidAliasSpecified()
+    public void testParseAliasWhenValidAliasSpecified() throws Exception
     {
         LinkParser parser = new LinkParser();
         Link link = new Link();
@@ -61,7 +61,7 @@
         assertFalse(link.isUsingPipeDelimiter());
     }
 
-    public void testParseAliasWhenTargetSpecified()
+    public void testParseAliasWhenTargetSpecified() throws Exception
     {
         LinkParser parser = new LinkParser();
         Link link = new Link();
@@ -184,6 +184,19 @@
         assertEquals("WebHome", sb.toString());
     }
 
+    public void testParseWhenSeparatorWithoutContentAfter() throws Exception
+    {
+        LinkParser parser = new LinkParser();
+        try {
+            parser.parse("|");
+            fail("Should have thrown an exception here");
+        } catch (ContentParserException expected) {
+            assertEquals("Error number 22002 in 17: Invalid link syntax. You need to specify a "
+                + "link reference or a target after the link separator, got [|]",
+                expected.getMessage());
+        }
+    }
+
     public void testParse() throws Exception
     {
         LinkParser parser = new LinkParser();
--- xwiki/core/src/main/resources/log4j.properties	Tue Feb 27 14:40:31 CET 2007
+++ xwiki/core/src/main/resources/log4j.properties	Tue Feb 27 14:40:31 CET 2007
@@ -24,6 +24,7 @@
 ### XWiki logging configuration
 log4j.logger.com.xpn.xwiki=warn
 log4j.logger.com.xpn.xwiki.render.XWikiRadeoxRenderEngine=warn
+log4j.logger.com.xpn.xwiki.content=debug
 
 ### Deactive Radeox warnings
 log4j.logger.org.radeox.macro.BaseLocaleMacro=error
--- xwiki/core/src/main/java/com/xpn/xwiki/content/Link.java	Wed Mar 28 19:27:26 CEST 2007
+++ xwiki/core/src/main/java/com/xpn/xwiki/content/Link.java	Wed Mar 28 19:27:26 CEST 2007
@@ -306,17 +306,8 @@
             buffer.append(':');
         }
 
-        if (getSpace() != null) {
-            buffer.append(getSpace());
-            buffer.append('.');
-        }
+        buffer.append(getCanonicalLinkName());
 
-        if (getPage() != null) {
-            buffer.append(getPage());
-        } else if (getURI() != null) {
-            buffer.append(getURI().toString());
-        }
-
         if (getAnchor() != null) {
             buffer.append('#');
             buffer.append(getAnchor());
@@ -335,6 +326,24 @@
         return buffer.toString();
     }
 
+    public String getCanonicalLinkName()
+    {
+        StringBuffer buffer = new StringBuffer();
+
+        if (getSpace() != null) {
+            buffer.append(getSpace());
+            buffer.append('.');
+        }
+
+        if (getPage() != null) {
+            buffer.append(getPage());
+        } else if (getURI() != null) {
+            buffer.append(getURI().toString());
+        }
+
+        return buffer.toString();
+    }
+
     /**
      * Append a delimiter symbol. See {@link #isUsingPipeDelimiter()}
      * @param buffer the buffer to append to
--- xwiki/core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	Mon Apr 09 04:57:32 CEST 2007
+++ xwiki/core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java	Mon Apr 09 04:57:32 CEST 2007
@@ -29,6 +29,9 @@
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.content.parsers.DocumentParser;
+import com.xpn.xwiki.content.parsers.ParsingResultCollection;
+import com.xpn.xwiki.content.Link;
 import com.xpn.xwiki.doc.XWikiAttachment;
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.doc.XWikiLink;
@@ -1451,27 +1454,29 @@
             // need to delete existing links before saving the page's one
             deleteLinks(doc.getId(), context, bTransaction);
 
-            // necessary to blank links from doc
-            context.remove("links");
+            // Parse the links from the current page and save them in the backlinks table
+            ParsingResultCollection results = new DocumentParser().parseLinks(doc.getContent());
 
-            // call to RenderEngine and converting the list of links into a list of backlinks
-            try {
-                XWikiRenderer renderer = context.getWiki().getRenderingEngine().getRenderer("wiki");
-                renderer.render(doc.getContent(), doc, doc, context);
-            } catch (Exception e) {
-                // If the rendering fails lets forget backlinks without errors
-            }
+            // Only keep unique links as we want to save each unique link once in the database.
+            // It'll fail if we save it twice as the id would be the same. In addition it would
+            // take longer and is thus unnecessary.
+            Set alreadySavedLinks = new HashSet();
+            for (Iterator links = results.getValidElements().iterator(); links.hasNext();) {
+                Link link = (Link) links.next();
+                if (!link.isExternal()
+                    && !alreadySavedLinks.contains(link.getCanonicalLinkName()))
+                {
+                    alreadySavedLinks.add(link.getCanonicalLinkName());
 
-            List links = (List)context.get("links");
-
-            if (links != null){
-                for (int i=0;i<links.size();i++) {
-                    // XWikiLink is the object declared in the Hibernate mapping
-                    XWikiLink link = new XWikiLink();
-                    link.setDocId(doc.getId());
-                    link.setLink((String)links.get(i));
-                    link.setFullName(doc.getFullName());
-                    session.save(link);
+                    XWikiLink wikiLink = new XWikiLink();
+                    wikiLink.setDocId(doc.getId());
+                    wikiLink.setLink(
+                        link.getNormalizedLink(context.getDoc().getSpace()).getCanonicalLinkName());
+                    wikiLink.setFullName(doc.getFullName());
+                    log.warn("Backlinks: id = " + doc.getId());
+                    log.warn("Backlinks:   link = " + link.getNormalizedLink(context.getDoc().getSpace()).getCanonicalLinkName());
+                    log.warn("Backlinks:   fullname = " + doc.getFullName());
+                    session.save(wikiLink);
                 }
             }
 
@@ -1480,6 +1485,7 @@
             }
         }
         catch (Exception e) {
+            log.warn("original error", e);
             throw new XWikiException( XWikiException.MODULE_XWIKI_STORE, XWikiException.ERROR_XWIKI_STORE_HIBERNATE_SAVING_LINKS,
                     "Exception while saving links", e);
         } finally {
--- xwiki/core/src/main/java/com/xpn/xwiki/render/XWikiRadeoxRenderEngine.java	Tue Mar 06 18:07:44 CET 2007
+++ xwiki/core/src/main/java/com/xpn/xwiki/render/XWikiRadeoxRenderEngine.java	Tue Mar 06 18:07:44 CET 2007
@@ -43,9 +43,7 @@
 import org.radeox.util.Service;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 public class XWikiRadeoxRenderEngine extends BaseRenderEngine implements WikiRenderEngine, ImageRenderEngine {
     private static Log log = LogFactory.getLog(XWikiRadeoxRenderEngine.class);
@@ -211,9 +209,6 @@
                     }
                 }
 
-                if ((db==null)||(database.equals(db)))
-                 addLinkToContext(newdoc.getFullName(), context);
-
                 URL url = context.getURLFactory().createURL(newdoc.getSpace(), newdoc.getName(),
                         "view", querystring, anchor, context);
                 buffer.append(context.getURLFactory().getURL(url, context));
@@ -226,23 +221,6 @@
         }
     }
 
-    private void addLinkToContext(String docname, XWikiContext context) {
-        // Add to backlinks in context object
-        try {
-                List links = (List) context.get("links");
-                if (links==null) {
-                    links = new ArrayList();
-                    context.put("links", links);
-                }
-                if (!links.contains(docname))
-                    links.add(docname);
-        } catch (Exception e) {
-            if (log.isErrorEnabled())
-                log.error("Error adding link to context", e);
-        }
-    }
-
-
     public void appendLink(StringBuffer buffer, String name, String view) {
         appendLink(buffer, name, view, null);
     }
@@ -292,9 +270,6 @@
                 querystring = "parent=" + currentdoc.getFullName();
             }
 
-            if ((db==null)||(database.equals(db)))
-             addLinkToContext(newdoc.getFullName(), context);
-
             String editor = context.getWiki().getEditorPreference(context);
             if ((!editor.equals("")&&(!editor.equals("text")))&&(!editor.equals("---")))
                 querystring += "&editor=" + editor;
--- xwiki/core/src/main/java/com/xpn/xwiki/XWikiException.java	Tue Mar 27 15:04:26 CEST 2007
+++ xwiki/core/src/main/java/com/xpn/xwiki/XWikiException.java	Tue Mar 27 15:04:26 CEST 2007
@@ -245,8 +245,8 @@
     // Content errors
     public static final int ERROR_XWIKI_CONTENT_LINK_INVALID_TARGET = 22000;
     public static final int ERROR_XWIKI_CONTENT_LINK_INVALID_URI = 22001;
+    public static final int ERROR_XWIKI_CONTENT_LINK_INVALID_SYNTAX = 22002;
 
-
     public XWikiException(int module, int code, String message, Throwable e, Object[] args) {
         setModule(module);
         setCode(code);
@@ -411,4 +411,4 @@
         pwriter.flush();
         return swriter.getBuffer().toString();
     }
-}
\ No newline at end of file
+}
--- xwiki/core/src/main/java/com/xpn/xwiki/content/parsers/LinkParser.java	Mon Apr 09 05:02:48 CEST 2007
+++ xwiki/core/src/main/java/com/xpn/xwiki/content/parsers/LinkParser.java	Mon Apr 09 05:02:48 CEST 2007
@@ -26,6 +26,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.apache.log4j.Logger;
+
 /**
  * Parses wiki links in the format defined in {@link com.xpn.xwiki.content.Link}.
  *
@@ -35,6 +37,11 @@
 public class LinkParser implements ContentParser
 {
     /**
+     * Log4J logger object to log messages in this class.
+     */
+    private static final Logger LOG = Logger.getLogger(LinkParser.class);
+
+    /**
      * Preferred separator for separating link parts (alias, link and target).
      */
     private static final String LINK_SEPARATOR_GREATERTHAN = ">";
@@ -56,6 +63,7 @@
      */
     public Link parse(String contentToParse) throws ContentParserException
     {
+        LOG.debug("Parsing link [" + contentToParse + "]");
         StringBuffer content = new StringBuffer(contentToParse.trim());
 
         Link link = new Link();
@@ -100,8 +108,9 @@
      * @param content the string to parse. This parameter will be modified by the method to remove
      *                the parsed content.
      * @param link the link on which to set the alias and the delimiter symbol used
+     * @throws ContentParserException if the link ends with a separator with no content after it
      */
-    protected void parseAlias(StringBuffer content, Link link)
+    protected void parseAlias(StringBuffer content, Link link) throws ContentParserException
     {
         String alias = null;
 
@@ -116,6 +125,14 @@
         if (separatorIndex != -1) {
             String text = content.substring(0, separatorIndex).trim();
 
+            // Check if there are characters after the separator as otherwise it's an invalid link
+            if (separatorIndex + 1 == content.length()) {
+                throw new ContentParserException(
+                    XWikiException.ERROR_XWIKI_CONTENT_LINK_INVALID_SYNTAX, "Invalid link "
+                    + "syntax. You need to specify a link reference or a target after the link "
+                    + "separator, got [" + content.toString() + "]");
+            }
+
             // Have we discovered a link or an alias?
             if (content.charAt(separatorIndex + 1) != '_') {
                 alias = text;