update url in api scripts

DFO-Ocean-Navigator · Nov 26, 2024 · 77ddcb5 · 77ddcb5
1 parent 5ccdd91
commit 77ddcb5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 29 deletions.
diff --git a/plotting/templates/python_csv_template.txt b/plotting/templates/python_csv_template.txt
@@ -18,7 +18,7 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+   base_url = "https://oceannavigator.ca/api/v2.0/plot/{p}?"
    url = base_url + urlencode({{"query": json.dumps(query)}}) + '&save=True&format=csv&size=10x7&dpi=144'
    print(url)
 

diff --git a/plotting/templates/python_plot_template.txt b/plotting/templates/python_plot_template.txt
@@ -20,7 +20,7 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+   base_url = "https://oceannavigator.ca/api/v2.0/plot/{p}?"
    url = base_url + urlencode({{"query": json.dumps(query)}}) + "&format=png&size=10x7&dpi=" + str(dpi)
    print(url)
 

diff --git a/plotting/templates/python_subset_template.txt b/plotting/templates/python_subset_template.txt
@@ -1,8 +1,6 @@
 import requests
 import os
 import shutil
-from urllib.request import urlopen
-from contextlib import closing
 
 
 def requestFile():
@@ -11,7 +9,7 @@ def requestFile():
 
 
    # Assemble full request
-   base_url = "https://navigator.oceansdata.ca/api/v2.0/subset/?"
+   base_url = "https://oceannavigator.ca/api/v2.0/subset/"+query["dataset_name"]+"/"+query["variables"]+"?"
    url = base_url
    for key in query:
       url += f"&{{key}}={{query[key]}}"

diff --git a/plotting/templates/rSUBSETtemplate.txt b/plotting/templates/rSUBSETtemplate.txt
diff --git a/plotting/templates/r_csv_template.txt b/plotting/templates/r_csv_template.txt
@@ -7,7 +7,7 @@ dpi <- 144
 queryObj <- fromJSON(query)
 fname <- paste("ONAV_CSV_", queryObj["dataset"],"_", queryObj["variable"],".csv", sep="")
 gsub("[\r\n]", "", query)
-base_url <- "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+base_url <- "https://oceannavigator.ca/api/v2.0/plot/{p}?"
 url <- paste(base_url,"&query=",URLencode(query),"&save=True&format=csv&size=10x7&dpi=",toString(dpi), sep="")
 print(url)
 

diff --git a/plotting/templates/r_plot_template.txt b/plotting/templates/r_plot_template.txt
@@ -8,7 +8,7 @@ queryObj <- fromJSON(query)
 fname <- paste("ONAV_PLOT_", queryObj["dataset"],"_", queryObj["variable"],".png", sep="")
 
 gsub("[\r\n]", "", query)
-base_url <- "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
+base_url <- "https://oceannavigator.ca/api/v2.0/plot/{p}?"
 url <- paste(base_url,"&query=",URLencode(query),"&dpi=",toString(dpi), sep="")
 print(url)
 

diff --git a/plotting/templates/r_subset_template.txt b/plotting/templates/r_subset_template.txt
@@ -1,6 +1,20 @@
 library(jsonlite)
 
-
 query <- '{q}'
 
-print("NOT IMPLEMENTED")
+queryObj <- fromJSON(query)
+fname <- "script_output.nc"
+
+base_url <- paste("https://oceannavigator.ca/api/v2.0/subset/", queryObj["dataset_name"], "/", queryObj["variables"], "?", sep="")
+url <- base_url
+
+for (key in names(queryObj))
+{{
+   url <- paste(url, "&", key, "=", queryObj[key], sep="")
+}}
+
+url  <- gsub(",[\r\n]", "", url)
+print(url)
+
+print(paste("Downloading file in location ",getwd(), " and exiting..."))
+download.file(url, fname, method="auto", mode="wb")