From 02b0803ab008d2358bd9e79721e6eb6a526f445a Mon Sep 17 00:00:00 2001
From: Kristian Zarebski <kristian.zarebski@ukaea.uk>
Date: Mon, 3 Aug 2020 14:04:30 +0100
Subject: [PATCH] Use school terms from processing in API

---
 .../processing_scripts/process_school_terms.R |  14 +++++++-------
 SCRC/pipeline_data/metadata.yaml              |   2 +-
 .../school_terms/{data.h5 => 0.20200803.0.h5} | Bin 8755 -> 8760 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename SCRC/pipeline_data/school_terms/{data.h5 => 0.20200803.0.h5} (79%)

diff --git a/SCRC/data_uploading/processing_scripts/process_school_terms.R b/SCRC/data_uploading/processing_scripts/process_school_terms.R
index d30bcf1..265c19d 100644
--- a/SCRC/data_uploading/processing_scripts/process_school_terms.R
+++ b/SCRC/data_uploading/processing_scripts/process_school_terms.R
@@ -21,7 +21,7 @@ product_name <- file.path("schools",
 
 tmp <- as.Date(date_accessed, format = "%Y-%m-%d")
 
-version_number <- paste("0", gsub("-", "", tmp), "0" , sep = ".")
+version_number <- paste(struct_version, gsub("-", "", tmp), dataset_version, sep = ".")
 
 namespace <- "LSHTM"
 
@@ -33,12 +33,12 @@ product_path <- product_name
 
 product_filename <- paste0(version_number, ".h5")
 
-product_storageRootId <- new_storage_root(name = product_storageRoot,
-                                          root = "ftp://boydorr.gla.ac.uk/scrc/",
-                                          key = key)
+#product_storageRootId <- new_storage_root(name = product_storageRoot,
+#                                          root = "ftp://boydorr.gla.ac.uk/scrc/",
+#                                          key = key)
 
-namespaceId <- new_namespace(name = namespace,
-                             key = key)
+#namespaceId <- new_namespace(name = namespace,
+#                             key = key)
 
 retrieve_file_data <- function()
 {
@@ -55,4 +55,4 @@ retrieve_file_data <- function()
 
 data <- retrieve_file_data()
 
-create_table(file="data_2.h5", path="SCRC/pipeline_data/school_terms", component="school_terms", df=data)
\ No newline at end of file
+create_table(file=paste(version_number, "h5", sep="."), path="SCRC/pipeline_data/school_terms", component="school_terms", df=data)
\ No newline at end of file
diff --git a/SCRC/pipeline_data/metadata.yaml b/SCRC/pipeline_data/metadata.yaml
index 6e3bc2e..3e77f96 100644
--- a/SCRC/pipeline_data/metadata.yaml
+++ b/SCRC/pipeline_data/metadata.yaml
@@ -67,7 +67,7 @@
   data_product : school_terms
   component : school_terms
   version : 1.0.0
-  filename : school_terms/data.h5
+  filename : school_terms/0.20200803.0.h5
 -
   data_product : intervention_rates
   component : intervention_rates
diff --git a/SCRC/pipeline_data/school_terms/data.h5 b/SCRC/pipeline_data/school_terms/0.20200803.0.h5
similarity index 79%
rename from SCRC/pipeline_data/school_terms/data.h5
rename to SCRC/pipeline_data/school_terms/0.20200803.0.h5
index 196967e121c569e29a2d110c6ce4773c39e6ae86..277d7c2725e33731c8e1ef8d7e5e86bb47876871 100644
GIT binary patch
literal 8760
zcmeHLO=uHA6rN3NT^o}owO0FMO$DJn49sqmCOK3sCN+Xusa8B0V~rL}jhG0v{@}5S
zU@soMv=?ulL{LFRL~o_^px~t!Aqd(_py0telX<U_%`TcA)7jFznfJ|mnfcyFW@hgv
z<HO#jjwT`=T_;<Jzud%+HF%=?qzC(mpNED9b_VQImuzT6{1LJn`~k>s9d~*(ksy2|
z=0^)*WVu1MbaW`YsTfEmhE9qFpM_PUo<4!jkc|BJL@t+26*AW+^TLO^JcI*kv`+d>
zx@DpX(B;4Mn*`x1{nl83IvH-&FaFBTfPQe9h4h7NhIdf6Ndz`%Pn{Tv3k{?0f}q>=
z{1zQ=@N4QmOe2lun)rb@4R$n5la6L!0QW67xmO<F#($rJ9LrtHT>T%C+Ic#m4e>8C
z>tsBe%L`4QW}Nca#WwKDi##s3Oy}XV5q+38Zwp)_7c-Z#=|YC@|MJmceQuX)b{qI$
zDdk=ZC`#ngJ-sQb&U&{(kTNwfAodYa57ZIbDTgd?dn^F#he3;5brl1O0mXn~Krx^g
zs2>K793D9)&R}>rEVp@AzR)4WWG165LQN*ujMwE#e1I}T;&2_X#D}SAN*vFJmGNQ9
z!V<^pOcf6K8|5%d{?PjT@Yq-xAEK;Z2I4)Y5;v(Ck~p4Kt+)X=`q4^$49W&%yr*h@
zMvNLfKk&ER7U%Jh-)oCAY63q#JDkNR1Ag%y@ppdw`$hdAKi&Z<ab7>*Ct#bO*AL=b
z9B>wqzz!!I^0(UJyncZ1bij?M1lpW%;AfXD-cQY#1n|92<@$MjAimu;-lPWL9kw{H
zAFRK#8jqIi5Blx0#d$pB-(!pO`h&i@?Ql_l;16KJP-y5-RxzL$Pz)#r6a$I@#eiZ!
zF`yXO^bAa$`|<I!*EQsizx(h$?OW+tW4hOO_skP*^l|9>&EtLFp7*5|7Q$l(=T;V9
z6t9%_|LVH);K1<Sxz)v2#mPeC#<Tga#j%n(9T<G{^Y_cki%Z3$rRa3);KT0t>in%Y
R_(B1gUT%J^&3@^;{Rdd<;Q0Um

literal 8755
zcmeHLPe>F|7=N>qI{9x~38^lv6%oOMnb~#CL!jj9Mv?tHc+zYg5n9`5R|q06UF=j8
z9iu3y=+w1K5<)~lWKn?^g)SZpFG8S6zBljtw0X=T>m}H}5%+uV`@Q$u_x<L_%zJw)
z)79NjyQh}P%d*%uw!?4Y#~-*7`&0(|h+lw)0dWH2^N4B~O#U&p3-U4G*T<bdn@%$^
z68SO0G&WbIS{5cK{#OcQ(w(Pe!F^CQ`sp3`48<s9NAmgHK+(H8T97&PWd{x@GnVpi
z##BTj;LFYY+Xu!a|CV_JDrC6sUwq0=fPb*e;^4)cCpzfc3<6t>=T7x@Ne`p%;^5nL
ze$B^Q{F;iNX0U4ip2R^o1Kwzcp%U9c0eo+n?2bRaSv;TO0)yvLHkU8R+q>ztThL06
z$ba<>7INgTc$fY8=%G?%VH{P$36d{jD%v`+I@yOZL|ftp8}f#8gGEp52h?Rjy=Elx
z2y2DX`~gkiFv<1f-tT_hcZX_#h(cKk$oGo8ALuKL*%B<DS~LLOk8v$cT~dG)AO%PP
zQh*ew90hug^`4Y_F#H+EZ;P(_frl~Ib{%e~xZSF1#^ZAkZ{-PF;cz_A<|nz+rf}RJ
z2InWa?I;|NH$mLxF7Q{YVH&^7oumSA+ZdcLN^lj9=bFE8n>!o)xK|D0Hc!C%Fpp8_
zBj(%O1%2vZeaPeE?d#>S`Y^nWyRbag5QcBa%NoOR7s_YRFkHxg1oC(W2&_-Y56fq<
zu=zqBTwhZ-?xY}(;UyM=35uiuDL@L40;B*bKnjooqyQ;E3XlT-RDo;#Ki?m3yxCEo
zesi$J9QwE#y}!S6>h1E%!ixhR#_vA+HnaF8H9Pk7^Np|LJ(G_gPT!utzBKyaRdMpt
gui2UJ^Cy<tmv<iR-uomvJ@s0vWNxu}>`d(N8hKO65dZ)H