svn commit: r387549 - /lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java

Author: josias
Date: Tue Mar 21 07:34:57 2006
New Revision: 387549

URL: http://svn.apache.org/viewcvs?rev=387549&view=rev
Log:
more code simplification

Modified:
    
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java

Modified: 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java?rev=387549&r1=387548&r2=387549&view=diff
==============================================================================
--- 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
 (original)
+++ 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
 Tue Mar 21 07:34:57 2006
@@ -125,11 +125,11 @@
         return Pattern.compile(
             "href\\s*=\\s*\""
                 + pageEnvelope.getContext()
-                + "/"
+                + "(/"
                 + pageEnvelope.getPublication().getId()
                 + "/"
                 + pageEnvelope.getDocument().getArea()
-                + "(/[-a-zA-Z0-9_/]+?)(_[a-z][a-z])?\\.html");
+                + "(/[-a-zA-Z0-9_/]+?)(_[a-z][a-z])?\\.html)");
     }
 
     /**
@@ -222,59 +222,28 @@
                     pageEnvelope.getDocument().getFile(),
                     internalLinkPattern,
                     1);
-            String[] internalLinksLanguages =
-                Grep.findPattern(
-                    pageEnvelope.getDocument().getFile(),
-                    internalLinkPattern,
-                    2);
 
             for (int i = 0; i < internalLinks.length; i++) {
-                String docId = internalLinks[i];
-                String language = null;
-
-                log.debug("docId: " + docId);
-                if (internalLinksLanguages[i] != null) {
-                    // trim the leading '_'
-                    language = internalLinksLanguages[i].substring(1);
+                Document document = builder.buildDocument(publication, 
internalLinks[i]);
+                
+                String docId = document.getId();
+                String language = document.getLanguage();
+
+                if (log.isDebugEnabled()) {
+                    log.debug("docId: " + docId);
+                    log.debug("language: " + language);
                 }
 
-                log.debug("language: " + language);
                 SiteTreeNode documentNode = sitetree.getNode(docId);
 
-                if (language == null) {
-                    String url =
-                        "/"
-                            + publication.getId()
-                            + "/"
-                            + pageEnvelope.getDocument().getArea()
-                            + docId
-                            + ".html";
-                    language =
-                        builder.buildDocument(publication, url).getLanguage();
-                }
-                log.debug("language: " + language);
                 if (documentNode == null
                     || documentNode.getLabel(language) == null) {
                     // the docId has not been published for the given language
-                    String url = null;
-                    if (language != null) {
-                        url =
-                            builder.buildCanonicalUrl(
-                                publication,
-                                Publication.AUTHORING_AREA,
-                                docId,
-                                language);
-                        log.debug("url: " + url);
-                    } else {
-                        url =
-                            builder.buildCanonicalUrl(
-                                publication,
-                                Publication.AUTHORING_AREA,
-                                docId);
-                        log.debug("url: " + url);
+                    if (log.isDebugEnabled()) {
+                        log.debug("url: " + internalLinks[i]);
                     }
                     unpublishedReferences.add(
-                        builder.buildDocument(publication, url));
+                        builder.buildDocument(publication, internalLinks[i]));
                 }
             }
         } catch (SiteTreeException e) {