Merge "Omaha #4001: Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes." into omaha_15.1.1

Former-commit-id: cd1c9f622d49d3ff5a0975cd53600de46a5172a0
This commit is contained in:
Lee Venable 2015-01-19 11:10:08 -06:00 committed by Gerrit Code Review
commit 4721c5455f
2 changed files with 17 additions and 0 deletions

View file

@ -143,6 +143,7 @@ import com.raytheon.uf.common.site.SiteMap;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.SimulatedTime;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.wmo.WMOHeader;
import com.raytheon.uf.viz.core.VizApp;
@ -343,6 +344,7 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox;
* 11Sep2014 3580 mapeters Replaced SerializationTuil usage with JAXBManager,
* removed IQueryTransport usage (no longer exists).
* 20Oct2014 3685 randerso Made conversion to upper case conditional on product id
* 15Feb2015 4001 dgilling Ensure all fields are set in SendPracticeProductRequest.
*
* </pre>
*
@ -5108,6 +5110,9 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
SendPracticeProductRequest req = new SendPracticeProductRequest();
req.setProductText(TextDisplayModel.getInstance().getProduct(
token));
req.setNotifyGFE(true);
req.setDrtString(new SimpleDateFormat("yyyyMMdd_HHmm")
.format(SimulatedTime.getSystemTime().getTime()));
ThriftClient.sendRequest(req);
} catch (VizException e) {

View file

@ -0,0 +1,12 @@
#!/bin/bash
# DR #4001 - force hazard services tables to be recreated
PSQL="/awips2/psql/bin/psql"
echo "INFO: Dropping hazard services tables"
${PSQL} -U awips -d metadata -q -c "DROP TABLE IF EXISTS productdata, producttext, practice_hazards, practice_hazards_attributes, hazards_interoperability, hazards_interoperability_gfe CASCADE;"
${PSQL} -U awips -d metadata -q -c "DROP TABLE IF EXISTS practice_hazards_interoperability, practice_hazards_interoperability_gfe CASCADE;"
${PSQL} -U awips -d metadata -q -c "UPDATE plugin_info SET initialized=false WHERE name='hazards' OR name ='com.raytheon.uf.common.hazards.productgen';"
echo "INFO: Hazard services tables successfully dropped."