Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/365671 )

Change subject: Remove checking of public web page data, since it no longer 
exists
......................................................................


Remove checking of public web page data, since it no longer exists

Bug: T152712
Change-Id: I6aecdd39d43d4e27ff2dfb44d4832ea13534a300
---
M scripts/check_web_page.sh
1 file changed, 2 insertions(+), 129 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index 1440ec7..df89697 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -34,7 +34,6 @@
 VERBOSITY="$VERBOSITY_NORMAL"
 
 # Urls to download files from
-PUBLIC_PART_URL_BASE="http://gp.wmflabs.org/";
 PRIVATE_PART_URL_BASE="https://stats.wikimedia.org/geowiki-private/";
 PRIVATE_PART_USER=
 PRIVATE_PART_PASSWORD=
@@ -314,27 +313,6 @@
     URL_BASE_CSV="$URL_BASE/data/datafiles/gp"
 }
 
-#---------------------------------------------------
-# Sets connection related variables to server of pubic geowiki files.
-#
-# Input:
-#
-# Output:
-#   HTTP_USER - User name used for authentication when fetching files
-#   HTTP_PASSWORD - Password used for authentication when fetching files
-#   URL_BASE - Base URL
-#   URL_BASE_CSV - URL to fetch CSVs from
-#   URL_BASE_DASHBOARD - URL to fetch dashboards from
-#   URL_BASE_DATASOURCE - URL to fetch datasources from
-#   URL_BASE_GRAPH - URL to fetch graphs from
-#
-use_public_server() {
-    set_URL_BASEs "$PUBLIC_PART_URL_BASE"
-
-    # The public serve should not require authentication
-    HTTP_USER=
-    HTTP_PASSWORD=
-}
 
 #---------------------------------------------------
 # Sets connection related variables to server of private geowiki files.
@@ -1473,94 +1451,6 @@
     esac
 }
 
-#---------------------------------------------------
-# Checks that geowiki's public dashboards are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_public_dashboards() {
-    check_dashboard reportcard
-}
-
-#---------------------------------------------------
-# Checks that geowiki's public graphs are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_public_graphs() {
-    check_graph active_editors_by_region
-    check_graph active_editors_total
-    check_graph global_north_south_active_editors
-    check_graph grants_count_by_global_south
-    check_graph grants_count_by_program
-    check_graph grants_spending_by_country
-    check_graph grants_spending_by_global_south
-    check_graph grants_spending_by_program
-    check_graph pt_wp_brazil
-}
-
-#---------------------------------------------------
-# Checks that geowiki's public datasources are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_public_datasources() {
-    check_datasource_json active_editors_total csv
-    check_datasource_json map-world_countries json
-
-    # The following datasources somewhat belong to geowiki, but are
-    # not part of the geowiki, so they have to be generated by
-    # hand. We monitor them to avoid data loss, but geowiki does not
-    # allow to keep the up-to-date. So we cannot check that they are
-    # up-to-date.
-    check_datasource_json grants_count_by_global_south    csv
-    check_datasource_json grants_count_by_program         csv
-    check_datasource_json grants_spending_by_country      json
-    check_datasource_json grants_spending_by_global_south csv
-    check_datasource_json grants_spending_by_program      csv
-}
-
-#---------------------------------------------------
-# Checks that geowiki's public datafiles are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_public_datafiles() {
-    check_csv_active_editors_total
-}
-
-#---------------------------------------------------
-# Checks that geowiki's private dashboards are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_private_dashboards() {
-    # Empty placeholder.
-    #
-    # This function just exists, so the check_* functions structure is
-    # nice and symmetrical between public and private checks
-    :
-}
 
 #---------------------------------------------------
 # Checks that geowiki's private graphs are ok.
@@ -1608,22 +1498,7 @@
     check_csv_wikis
 }
 
-#---------------------------------------------------
-# Checks that geowiki's public files are ok.
-#
-# Input:
-#   -
-#
-# Output:
-#   -
-#
-check_public_data() {
-    use_public_server
-    check_public_dashboards
-    check_public_graphs
-    check_public_datasources
-    check_public_datafiles
-}
+
 
 #---------------------------------------------------
 # Checks that geowiki's private files are ok.
@@ -1643,7 +1518,6 @@
     # check them.
     if [ "$CHECK_PRIVATE_PART_LIMN_FILES" = "yes" ]
     then
-       check_private_dashboards
        check_private_graphs
        check_private_datasources
     fi
@@ -1651,7 +1525,7 @@
 }
 
 #---------------------------------------------------
-# Checks that geowiki's public, and private files are ok.
+# Checks that geowiki's private files are ok.
 #
 # Input:
 #   -
@@ -1660,7 +1534,6 @@
 #   -
 #
 check() {
-    check_public_data
     check_private_data
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/365671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6aecdd39d43d4e27ff2dfb44d4832ea13534a300
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to