You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2004/01/07 14:33:44 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication/xsp DocumentReferencesHelper.java
egli 2004/01/07 05:33:44
Modified: src/java/org/apache/lenya/cms/publication/xsp
DocumentReferencesHelper.java
Log:
If the internal reference does not specify a language use the default
language (with the help of the document builder).
Revision Changes Path
1.14 +27 -14 cocoon-lenya/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java
Index: DocumentReferencesHelper.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/xsp/DocumentReferencesHelper.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DocumentReferencesHelper.java 3 Nov 2003 18:19:07 -0000 1.13
+++ DocumentReferencesHelper.java 7 Jan 2004 13:33:44 -0000 1.14
@@ -192,6 +192,7 @@
area,
inconsistentFiles[i]);
language = fileMapper.getLanguage(inconsistentFiles[i]);
+
String url = null;
if (language != null) {
url =
@@ -250,13 +251,25 @@
for (int i = 0; i < internalLinks.length; i++) {
String docId = internalLinks[i];
- String language = null;
-
- if (internalLinksLanguages[i] != null) {
- // trim the leading '_'
- language = internalLinksLanguages[i].substring(1);
- }
+ String language = null;
+
+ if (internalLinksLanguages[i] != null) {
+ // trim the leading '_'
+ language = internalLinksLanguages[i].substring(1);
+ }
+
SiteTreeNode documentNode = sitetree.getNode(docId);
+
+ if (language == null) {
+ String url =
+ "/"
+ + publication.getId()
+ + "/"
+ + pageEnvelope.getDocument().getArea()
+ + docId
+ + ".html";
+ language = builder.buildDocument(publication, url).getLanguage();
+ }
if (documentNode == null
|| documentNode.getLabel(language) == null) {
// the docId has not been published for the given language
@@ -269,12 +282,12 @@
docId,
language);
} else {
- url =
- builder.buildCanonicalUrl(
- publication,
- Publication.AUTHORING_AREA,
- docId);
- }
+ url =
+ builder.buildCanonicalUrl(
+ publication,
+ Publication.AUTHORING_AREA,
+ docId);
+ }
unpublishedReferences.add(
builder.buildDocument(publication, url));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org