From 02d3f28c0606f426e299b53d88cfd06fc0bfea5d Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 19 Aug 2013 15:59:54 -0500 Subject: [PATCH] Issue #2275 Add dataURI column back into bufrmos types. Former-commit-id: d6ab7d08be29654dc276d5a395b71729581cdf79 [formerly 4cb853ac39e5b22c591870b0017980f7cd8e4ef1] [formerly d6ab7d08be29654dc276d5a395b71729581cdf79 [formerly 4cb853ac39e5b22c591870b0017980f7cd8e4ef1] [formerly 9219db0069de5c7a8f33cadd904dd929b4852cf9 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]] Former-commit-id: 9219db0069de5c7a8f33cadd904dd929b4852cf9 Former-commit-id: 3a8893846fb9e118dd3c3c6c8c8e72996bfe40af [formerly 8b9031719a7045401a714bcdacb973b9950c7ae2] Former-commit-id: 7668fdbde77d49a8d5402717e4a4778cdf484bf9 --- deltaScripts/13.5.2/addBufrmosDataURI.sh | 22 +++++++++++++++++++ .../plugin/bufrmos/common/BufrMosAvnData.java | 12 ++++++++++ .../plugin/bufrmos/common/BufrMosHpcData.java | 12 ++++++++++ 3 files changed, 46 insertions(+) create mode 100644 deltaScripts/13.5.2/addBufrmosDataURI.sh diff --git a/deltaScripts/13.5.2/addBufrmosDataURI.sh b/deltaScripts/13.5.2/addBufrmosDataURI.sh new file mode 100644 index 0000000000..b1ee9118d6 --- /dev/null +++ b/deltaScripts/13.5.2/addBufrmosDataURI.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# DR #2275 - this script is needd to add the dataURI column back into the +# bufrmosavn and bufrmoshpc tables. + +PSQL="/awips2/psql/bin/psql" + +${PSQL} -U awips -d metadata -c "ALTER TABLE bufrmosavn ADD COLUMN datauri character varying(255);" +if [ $? -ne 0 ]; then + echo "ERROR: Failed to drop dataURI column for bufrmosavn" + echo "FATAL: The update has failed." + exit 1 + fi +${PSQL} -U awips -d metadata -c "ALTER TABLE bufrmoshpc ADD COLUMN datauri character varying(255);" +if [ $? -ne 0 ]; then + echo "ERROR: Failed to add dataURI column for bufrmoshpc" + echo "FATAL: The update has failed." + exit 1 + fi +${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE bufrmosavn" +${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE bufrmoshpc" + +echo "INFO: dataURI columns added successfully" diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java index 630af09cbb..79a9700b63 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java @@ -19,6 +19,9 @@ **/ package com.raytheon.edex.plugin.bufrmos.common; +import javax.persistence.Access; +import javax.persistence.AccessType; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.SequenceGenerator; import javax.persistence.Table; @@ -48,6 +51,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * May 07, 2013 1869 bsteffen Remove dataURI column from * PluginDataObject. * May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos. + * Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos + * types. * * * @@ -77,4 +82,11 @@ public class BufrMosAvnData extends BufrMosData { return MOSType.AVN; } + @Override + @Column + @Access(AccessType.PROPERTY) + public String getDataURI() { + return super.getDataURI(); + } + } diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java index 9ee9929ef8..bbc388319c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java @@ -19,6 +19,9 @@ **/ package com.raytheon.edex.plugin.bufrmos.common; +import javax.persistence.Access; +import javax.persistence.AccessType; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.SequenceGenerator; import javax.persistence.Table; @@ -48,6 +51,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * May 07, 2013 1869 bsteffen Remove dataURI column from * PluginDataObject. * May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos. + * Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos + * types. * * * @@ -77,4 +82,11 @@ public class BufrMosHpcData extends BufrMosData { return MOSType.HPC; } + @Override + @Column + @Access(AccessType.PROPERTY) + public String getDataURI() { + return super.getDataURI(); + } + }