diff --git a/deltaScripts/16.1.2/DR4360/alterBufrssmiDataURI.sh b/deltaScripts/16.1.2/DR4360/alterBufrssmiDataURI.sh new file mode 100755 index 0000000000..ace0116da3 --- /dev/null +++ b/deltaScripts/16.1.2/DR4360/alterBufrssmiDataURI.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# DR #4360 - this update script will alter the dataURI columns from bufrssmi + +PSQL="/awips2/psql/bin/psql" + +cmdDir=`dirname $0` + +source ${cmdDir}/commonFunctions.sh +table=bufrssmi + +# table and constraint names form BufrMTHDWObs. +echo "INFO: Start update of ${table} dataURI columns." +renameConstraint ${table} uk_${table}_datauri_fields + +col=satid +echo "INFO: Update ${table}'s ${col}" +# The IDecoderConstants.VAL_MISSING used by SSMIDataAdapter. +${PSQL} -U awips -d metadata -c "UPDATE ${table} SET ${col}=-9999998 where ${col} is NULL ; " +updateNotNullCol ${table} ${col} + +echo "INFO: ${table} dataURI columns updated successfully" diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java index e67577437c..0ab5eaaba1 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java @@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Geometry; * types. * Aug 30, 2013 2298 rjpeter Make getPluginName abstract * May 12, 2014 3133 njensen Use TimeUtil instead of TimeTools + * Jul 17, 2015 4360 rferrel Named unique constraint and satIde no longer nullable. * * * @@ -71,7 +72,7 @@ import com.vividsolutions.jts.geom.Geometry; */ @Entity @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrssmiseq") -@Table(name = "bufrssmi", uniqueConstraints = { @UniqueConstraint(columnNames = { +@Table(name = "bufrssmi", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrssmi_datauri_fields", columnNames = { "stationid", "refTime", "satId", "latitude", "longitude" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since @@ -86,10 +87,12 @@ public class SSMIScanData extends PersistablePluginDataObject implements private static final long serialVersionUID = 1L; @DataURI(position = 1) + @Column(nullable = false) @XmlAttribute @DynamicSerializeElement - private Integer satId; + private int satId; + // TODO Update once SurfaceObsLocation DataURI's are corrected. @Embedded @DataURI(position = 2, embedded = true) @DynamicSerializeElement @@ -188,7 +191,7 @@ public class SSMIScanData extends PersistablePluginDataObject implements /** * @return the satId */ - public Integer getSatId() { + public int getSatId() { return satId; } @@ -196,7 +199,7 @@ public class SSMIScanData extends PersistablePluginDataObject implements * @param satId * the satId to set */ - public void setSatId(Integer satId) { + public void setSatId(int satId) { this.satId = satId; }