diff options
author | Dirk Dougherty <ddougherty@google.com> | 2015-10-14 18:23:15 -0700 |
---|---|---|
committer | Dirk Dougherty <ddougherty@google.com> | 2015-10-14 18:23:15 -0700 |
commit | 210dc2a1c005b47966ad5dce2543b0a107844e91 (patch) | |
tree | 74b4b5be9f0ebfafd9171f67d738e0476901b428 | |
parent | 16d2f7ce802941be8ed65fe3f29f57f09a08ec8b (diff) | |
download | platform_external_doclava-210dc2a1c005b47966ad5dce2543b0a107844e91.tar.gz platform_external_doclava-210dc2a1c005b47966ad5dce2543b0a107844e91.tar.bz2 platform_external_doclava-210dc2a1c005b47966ad5dce2543b0a107844e91.zip |
Add extract page canonical url and pass to templates.
Change-Id: Icee9810bb13b598df2cd2beb6b12f8eadd8264db
-rw-r--r-- | src/com/google/doclava/PageMetadata.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/google/doclava/PageMetadata.java b/src/com/google/doclava/PageMetadata.java index 57f27cb..4c2a773 100644 --- a/src/com/google/doclava/PageMetadata.java +++ b/src/com/google/doclava/PageMetadata.java @@ -144,7 +144,7 @@ public class PageMetadata { pageMeta.setKeywords(getPageTagsNormalized(hdf, "page.tags")); pageMeta.setTags(getPageTagsNormalized(hdf, "meta.tags")); pageMeta.setImage(getImageUrlNormalized(hdf.getValue("page.image", ""))); - pageMeta.setLang(getLangStringNormalized(filename)); + pageMeta.setLang(getLangStringNormalized(hdf, filename)); pageMeta.setType(getStringValueNormalized(hdf, "page.type")); appendMetaNodeByType(pageMeta, tagList); } @@ -370,19 +370,24 @@ public class PageMetadata { * @param filename A path string to the file relative to root. * @return A normalized lang value. */ - public static String getLangStringNormalized(String filename) { - String[] stripStr = filename.toLowerCase().split("\\/"); + public static String getLangStringNormalized(Data data, String filename) { + String[] stripStr = filename.toLowerCase().split("\\/", 3); String outFrag = "en"; + String pathCanonical = filename; if (stripStr.length > 0) { for (String t : DocFile.DEVSITE_VALID_LANGS) { if ("intl".equals(stripStr[0])) { if (t.equals(stripStr[1])) { outFrag = stripStr[1]; + //extract the root url (exclusive of intl/nn) + pathCanonical = stripStr[2]; break; } } } } + //extract the root url (exclusive of intl/nn) + data.setValue("path.canonical", pathCanonical); return outFrag; } |