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

fixing merge from ssl revert

Browse source
This commit is contained in:
mjames-upc 2017-04-24 18:53:22 -06:00
parent d252af3278
commit 74a4c7281d
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/DHRgather
View file

@ -155,11 +155,7 @@ touch /tmp/dhrgather_control.temp
Num_Rad=$(
echo "select count(*) from Radarloc WHERE use_radar='T'; " | \
<<<<<<< HEAD
$POSTGRESQLBINDIR/psql -q -t $DB_NAME
=======
$POSTGRESQLBINDIR/psql -q -t $DB_NAME
>>>>>>> parent of ca980b9... ASM #19760 - Nativelib code updates for db connection with ssl
)
if [[ $Num_Rad = 0 ]]

4
nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/DSPgather
View file

@ -110,11 +110,7 @@ touch /tmp/dhrgather_control.temp
Num_Rad=$(
echo "select count(*) from Radarloc WHERE use_radar='T'; " | \
<<<<<<< HEAD
$POSTGRESQLBINDIR/psql -q -t $DB_NAME
=======
$POSTGRESQLBINDIR/psql -q -t $DB_NAME
>>>>>>> parent of ca980b9... ASM #19760 - Nativelib code updates for db connection with ssl
)
if [[ $Num_Rad = 0 ]]

4
nativeLib/files.native/awipsShare/hydroapps/whfs/bin/init_rivermon_tables.ksh
View file

@ -13,11 +13,7 @@ export DB_NAME=$(get_apps_defaults db_name)
###################### function
fn(){
<<<<<<< HEAD
psql $DB_NAME -e << END
=======
psql $DB_NAME -e << END
>>>>>>> parent of ca980b9... ASM #19760 - Nativelib code updates for db connection with ssl
\copy rpffcstgroup (group_id, group_name, ordinal) to './input.grp' with delimiter '|'
\copy rivermongroup(group_id, group_name, ordinal) from './input.grp' with delimiter '|'
insert into rivermongroup values('DEFAULT', 'DEFAULT GROUP', 1);