xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2581 fix local storm report delta script and unique constraint

Browse source 
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809

Former-commit-id: 059e057cdb [formerly 562e85e45b [formerly e6feb413f7] [formerly 059e057cdb [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]]
Former-commit-id: 562e85e45b [formerly e6feb413f7]
Former-commit-id: 562e85e45b
Former-commit-id: 16d01f1ca7
This commit is contained in:
Nate Jensen 2014-01-15 09:50:35 -06:00
parent 58cd2d5dd7
commit f6bf9ccac8
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cots/org.apache.camel/.classpath
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="camel-core-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-http-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="camel-http4-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="camel-jetty-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="camel-http-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-http4-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-jetty-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-jms-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-quartz-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="camel-spring-2.11.2.jar"/>
<classpathentry exported="true" kind="lib" path="camel-quartz-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="camel-spring-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>

2
deltaScripts/14.2.1/dropLSRdataURI.sh
View file

@ -36,7 +36,7 @@ function dropDatauriAndAddConstraint {
echo "INFO: Dropping dataURI columns."
dropDatauriAndAddConstraint lsr lsr_latitude_longitude_stationId_reftime_forecasttime_eventtype_key "(latitude, longitude, stationId, reftime, forecasttime, eventtype)"
dropDatauriAndAddConstraint lsr lsr_latitude_longitude_officeId_reftime_forecasttime_eventtype_key "(latitude, longitude, officeId, reftime, forecasttime, eventtype)"
echo "INFO: LSR dataURI column dropped successfully"

3
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
View file

@ -69,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Oct 14, 2013 2361 njensen Removed XML annotations and IDecoderGettable
* Dec 10, 2013 2581 njensen Removed dataURI column
* Jan 15, 2014 2581 njensen Changed constraint to use officeId instead of stationId
*
* </pre>
*
@ -78,7 +79,7 @@ import com.vividsolutions.jts.geom.Geometry;
@Entity
@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "lsrseq")
@Table(name = "lsr", uniqueConstraints = { @UniqueConstraint(columnNames = {
"latitude", "longitude", "stationId", "refTime", "forecastTime",
"latitude", "longitude", "officeId", "refTime", "forecastTime",
"eventType" }) })
/*
* Both refTime and forecastTime are included in the refTimeIndex since