From d9ebad81fa9bbf4fae258892a1b049bf6c2b0432 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 6 Feb 2017 06:25:23 -0600 Subject: [PATCH] major refactor cont'd --- gs/data.gs | 3 ++- gs/html-links.gs | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gs/data.gs b/gs/data.gs index ab3c355b8..4c9de5dfb 100644 --- a/gs/data.gs +++ b/gs/data.gs @@ -89,7 +89,8 @@ function refreshPublic() { columnDataTopCell.setValue("=ARRAYFORMULA(IF(Parsed!A2:A=\"\",\"\",\"

\"&Parsed!A2:A&Parsed!B2:B&Parsed!C2:C&Parsed!D2:D&Parsed!E2:E&Parsed!F2:F&Parsed!G2:G&\"

\"))"); break; case "related": - columnDataTopCell.setValue("=ARRAYFORMULA(INDIRECT(\"Parsed!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"\")))"); + columnDataTopCell.setValue("=createHtmlRelatedLinkArray(INDIRECT(\"Data!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"\")))"); + //columnDataTopCell.setValue("=ARRAYFORMULA(INDIRECT(\"Parsed!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Parsed!A1:1,0),4),\"1\",\"\")))"); break; default: } diff --git a/gs/html-links.gs b/gs/html-links.gs index 4575ad04c..0803e11bd 100644 --- a/gs/html-links.gs +++ b/gs/html-links.gs @@ -103,17 +103,23 @@ function createHtmlDonateLinkArray(url, listName) { } } -function createHtmlRelatedLinkArray(forkComboListName, filterListsPageSlug) { - if (forkComboListName instanceof Array) { - for (i in forkComboListName) { - forkComboListName[i] = createHtmlRelatedLinkArray(forkComboListName[i], filterListsPageSlug[i]); +function createHtmlRelatedLinkArray(related) { + if (related instanceof Array) { + for (i in related) { + related[i] = createHtmlRelatedLinkArray(related[i]); } - return forkComboListName; + return related; } else { - if (forkComboListName == null) { - return null; + if (!related) { + return ""; } else { - return "" + relatedArray[i] + ""; + } + relatedHtml += ""; + return relatedHtml; } } }