From ee79b6830c58ea053360d0ee81f929379132a4d1 Mon Sep 17 00:00:00 2001 From: James Korman Date: Fri, 12 Oct 2012 09:59:54 -0500 Subject: [PATCH 1/5] Issue #1252 - Updated with changes from Dale Morris Former-commit-id: 8d71a3dc9224ba16b58a527ab7e4bd1223cda51a [formerly 6d5df727e59c8ae9372cf6ce7c61179f15dfc66d] [formerly 2fad414d6d03a77899339a055b8ce680eea89d44] [formerly 20c61590a4b7ef0b1a3b437fb62c951ee7c72053 [formerly 2fad414d6d03a77899339a055b8ce680eea89d44 [formerly f48f637e60f7537da42681dc001332257a046d2b]]] Former-commit-id: 20c61590a4b7ef0b1a3b437fb62c951ee7c72053 Former-commit-id: cb2d57100027ea4633da455b3e456d1969e40798 [formerly 4ce298e736ee09c662c81962203b7ddfcd77a003] Former-commit-id: b306b6bd0ae03d55b123b619c7e46a0e48ed6bba --- .../Installer.ldm/patch/etc/new_pqact.txt | 627 ++++++++++++++++++ .../patch/etc/pqact.conf.template | 83 ++- 2 files changed, 694 insertions(+), 16 deletions(-) create mode 100644 rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt b/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt new file mode 100644 index 0000000000..fd895b2376 --- /dev/null +++ b/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt @@ -0,0 +1,627 @@ +# /-\-/-\-/-\-/-\- acq_patterns.template /-\-/-\-/-\-/-\- +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 20120905 1090 jkorman Corrected several patterns as well as +# combining similar patterns. +#20121009 1252 jkorman Corrections and additions from Dale Morris. +#*************************************************************** +# AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw +# PGNA00 KWNS 010001 !redbook 1_1/NMCGPHMCD/MCDSUM/PXSF001CN/20110201 0001 +ANY ^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8}) + FILE -overwrite -log -close -edex /data_store/redbook/(\3:yyyy)(\3:mm)\3/\4/\8/\4\5Z_\8_\7_\6-\1_\2_(seq).rb.%Y%m%d%H + +# AWIPS 1 PATTERN IMAGE ^T.* /sat/SBN/Raw +# satz/ch2/GOES-11/WV/20110201 1830/NHEM-COMP/24km/ TIGF05 KNES 011830 +NIMAGE ^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/sat/(\(10):yyyy)(\(10):mm)\(10)/\(11)/\2/\(11)\(12)Z_\3_\7_\6_\8_\9_(seq).satz.%Y%m%d%H + +# AWIPS 1 PATTERN GRID ^YEI.[89]8.*KWNH /img/SBN/Raw +# YEIN98 KWNH 011800 /mRFC_QPF !grib/ncep/RFC_QPF/#218/201102011800/F018/APCP/sfc/ +#!MAINT! This line is a subset duplicate of line 68 - However cannot find any data matching this pattern. +HDS ^(YEI.[89]8) KWNH (..)(..)(..)[^!]*!(grib|grib2)/ncep/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS 1 GRID ^ZETA98.*K[NW][EN][ES] /img/SBN/Raw +# ZETA98 KNES 011516 /mNWS_190 !grib/nws/NWS_190/#255/201102011400/F001/APCP/sfc/ +# ZETA98 KWNE 311200 /mRFC_QPE !grib/ncep/RFC_QPE/#240/201101311200/F006/APCP/sfc/ +HDS ^(ZETA98) (K[NW][EN][ES]) (..)(..)(..)([^!]*)!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/([^/]*)/([^/]*) + FILE -overwrite -log -close -edex /data_store/\7/(\3:yyyy)(\3:mm)\3/\4/\8/GRID\9/\(11)Z_\(12)_\(13)-\1_\2_\3\4\5_(seq).\7.%Y%m%d%H + +# AWIPS 1 GRID ^ZEGA98.*KNES /img/SBN/Raw +# +ANY ^(ZEGA98) (KNES) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# AWIPS 1: GRID ^ZEGZ98.*K.* /img/SBN/Raw +# ZEGZ98 KORN 011927 /mNWS_151 !grib/nws/NWS_151/#255/201102011800/F024/CNWAT/sfc/ +# ZEGZ98 KEY 1HR=HPBL, 3HR=5WAVH, 6HR=CNWAT +HDS ^(ZEGZ98) (K.{3}) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS 1: GRID ^[YZ][ES]QA88.*KMSR /img/SBN/Raw +# YSQA88 KMSR 011220 /mNWS_185 !grib/nws/NWS_185/#255/201102010600/F000/MSTAV/sfc/ +# YEQA88 KMSR 011210 !grib2/nws/NWS_255/#255/201102010600F000/WEASD/0 + +HDS ^([YZ][ES]QA88) KMSR (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KMSR_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS 1: GRID ^HAXA00.*KWBC /img/SBN/Raw +# HAXA00 KWBC 312349 /mNWS_0 !grib/nwstg/NWS_0/#255/201101312349/F000/RDSP1/sfc/ + +HDS ^HAXA00 KWBC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\4/(\1:yyyy)(\1:mm)\1/\2/\5/GRID\6/\8Z_\9_\(10)-HAXA00_KWBC_\1\2\3_(seq).\4.%Y%m%d%H + +# AWIPS 1: GRID ^ZDWA88.*KWNO /img/SBN/Raw +# GRID ^ZDWB88.*KWNO /img/SBN/Raw +# GRID ^ZDWC88.*KWNO /img/SBN/Raw +# GRID ^ZDWD88.*KWNO /img/SBN/Raw +# GRID ^ZEWD88.*KWNO /img/SBN/Raw +# GRID ^ZDWD98.*KWNO /img/SBN/Raw +# ZDWA88 KWNO 011400 /m0 !grib/ncep/0/#236/201102011400/F003/U-GWD/0 m above gnd/ + +HDS ^(Z[DE]W[A-D][89]8) KWNO (..)(..)(..) /m0 !(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/3hr/GRID\7/\9Z_\(10)_\(11)-\1_KWNO_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^[YZ].[A-WYZ].*KWB.* /Grid/SBN/Raw +# YUWG97 KWBG 010600 /mRUC2 !grib/ncep/RUC2/#236/201102010600/F006/UGRD/tropopause/ +HDS ^([YZ].[A-WYZ].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^YEI.[89]8.*KWNH /Grid/SBN/Raw +#!MAINT! This line is a superset duplicate of line 16 (which only triggers on /ncep/) - However cannot find any data matching this pattern. +HDS ^(YEI.[89]8) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H + +# This line enables the regional rfc qpf gribs +HDS ^(YEI.[89]8) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUA) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/[^/]*/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + + +# AWIPS1: GRID ^ZEX.98.*KWNH /Grid/SBN/Raw +# ZEXM98 KWNH 020000 /mNCEP_QPF !grib/ncep/NCEP_QPF/#218/201102020000/F072/APCP/sfc/ + +HDS ^(ZEX.98) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H + +## -- ECMF, UKMET, MRF -- ## + +# AWIPS1: GRID ^H.[A-H].*ECMF /Grid/SBN/Raw +# HVAS50 ECMF 011200 /mECMWF_139 !grib/ecmwf/ECMWF_139/#001/201102011200/F168/VGRD/500 mb/ + +HDS ^(H.[A-H].{1,3}) ECMF (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_ECMF_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^H.[I-L].*EGRR /Grid/SBN/Raw +# AWIPS1: GRID ^H.[I-L].*KWBK /Grid/SBN/Raw +# HVKH30 EGRR 011200 /mUKM_45 !grib/ukmet/UKM_45/#039/201102011200/F042/VGRD/300 mb/ +# HTJA85 KWBK 010000 /mSSIGFS !grib/ncep/SSIGFS/#038/201102010000/F000/TMP/850 mb/ +# HHJA85 KWBK 010000 /mSPEC62MRF !grib/ncep/SPEC62MRF/#038/201102010000/F000/HGT/850 mb/ + +HDS ^(H.[I-L].{1,3}) (EGRR|KWBK) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^H.X.*KNWC /Grid/SBN/Raw +# *** NOT FOUND IN INGEST STREAM *** + +ANY ^(H.X...) KNWC (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib/(\2:yyyy)(\2:mm)\2/\3/MISC/\1_KNWC_\2\3\4_(seq).grib.%Y%m%d%H + +# AWIPS1: GRID ^O.[JMNQ].*KWBJ /Grid/SBN/Raw +# ONQZ88 KWBJ 020000 /mNWW_124 !grib/ncep/NWW_124/#253/201102020000/F108/WVDIR/sfc/ + +HDS ^(O.[JMNQ].{1,3}) KWBJ (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBJ_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^O.N.*KWBM /Grid/SBN/Raw +# OENA88 KWBM 020000 /mICE_120 !grib/ncep/ICE_120/#219/201102020000/F000/ICEC/MSL/ +#HDS ^(O.N.{1,3}) KWBM (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) +# FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBM_\2\3\4_(seq).\5.%Y%m%d%H +# +# AWIPS1: GRID ^O.L.*KWBI /Grid/SBN/Raw +# OTLA88 KWBI 010000 /mSST !grib/ncep/SST/#235/201102010000/F000/TMP/sfc/ +#HDS ^(O.L.{1,3}) KWBI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) +# FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBI_\2\3\4_(seq).\5.%Y%m%d%H +#!MAINT! Combined the above two patterns into one. The only difference was KWBM vs KWBI +HDS ^(O.N.{1,3}) (KWBM|KWBI) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^OEBA88.*KNWC /Grid/SBN/Raw +# OEBA88 KNWC 271200 /m120 !grib/noc/120/#255/201101270000/F000/ICEC/sfc/ +# FNMOC Seasonal Great Lakes Ice edge gridded data. +HDS ^(OEBA88) KNWC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/ICE/GRID\7/\9Z_\(10)_\(11)-\1_KNWC_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^[YZ][UV]M.98.*KNHC /Grid/SBN/Raw +# *** NOT FOUND IN INGEST STREAM *** + +ANY ^([YZ][UV]M.98) KNHC (..)(..)(..)[^!]*!(grib|grib2) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/TPCTcm/\1_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^H[ET]QV[01][0-9].*KWNC /Grid/SBN/Raw +# HEQV01 KWNC 151200 /mFORECASTER !grib/ncep/FORECASTER/#211/201012150100/F000/CLWMR/sfc/ +# NCEP/CPC Precipitation and Temperature anomaly +# *** NOT FOUND IN INGEST STREAM *** +ANY ^(H[ET]QV[01][0-9]) KWNC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNC_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^Y[IJL]XA[0-9][0-9].*KKCI /Grid/SBN/Raw +# YIXA48 KKCI 012300 /mAWC_CIP !grib/ncep/AWC_CIP/#252/201102012300/F000/NLAT/5791 m above MSL/ + +HDS ^(Y[IJL]XA[0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^YAW[BCDGJM][0-9][0-9].*KKCI /Grid/SBN/Raw +# YAWB43 KKCI 012200 /mAWC_CIP !grib/ncep/AWC_CIP/#252/201102012200/F001/NLAT/6705 m above MSL/ + +HDS ^(YAW[BCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^YVW[ABCDGJM][0-9][0-9].*KKCI /Grid/SBN/Raw +# YVWA41 KKCI 012200 /mRUC2 !grib/ncep/RUC2/#255/201102012200/F000/TURB/7010 m above MSL/ + +HDS ^(YVW[ABCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H + +# AWIPS1: GRID ^[LM].[ABDHMNRSTU].*KWB.* /Grid/SBN/rawGrib2 +# LTHO70 KWBC 011800 !grib2/ncep/GFS/#213/201102011800F120/TMPK/700 hPa PRES + +NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# MosGuidance, perhaps others? +# LVUC00 KWBQ 271200 !grib2/ncep/GFS/#197/FHRS//LVL +# Maint : fixed pattern at F... +HDS ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2 +# LEMG98 KWNH 020600 !grib2/ncep/NCEP_QPF/#001/201102020600F036/P06M/0 - NONE + +NGRID ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +HDS ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^[LM].E.*KWBD* /Grid/SBN/rawGrib2 +# MUEU98 KWBD 020600 !grib2/ncep/DGEX_115/#185/201102020600F090/UREL/10 m HGHT +NGRID ^([LM].E.{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^L.U.*KWBN* /Grid/SBN/rawGrib2 +# LAUE06 KWBN 021200 !grib2/ncep/NDFD/#197/201102021200F096/CLD/0 - NONE + +#NGRID ^(L.U.*) (KWBN) (..)(..)(..) .*!(grib|grib2)/.*/(.*)/#(.*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) +# FILE -overwrite -log -close -edex /data_store/\6/GRID\8/\7/\9/\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d + +# AWIPS1: GRID ^L[AB]U[ABC].*KWNO* /Grid/SBN/rawGrib2 +# LBUB05 KWNO 012200 !grib2/ncep/LAMP/#197/201102012200F007/CTSTM02/0 - NONE + +NGRID ^(L[AB]U[ABC].{1,3}) (KWNO) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^L[UV]I.*KWBJ* /Grid/SBN/rawGrib2 +# LVIB88 KWBJ 011800 !grib2/ncep/GFS/#255/201102011800F003/VSBY/10 m HGHT + +NGRID ^(L[UV]I.{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^[LM]DG.*KNHC* /Grid/SBN/rawGrib2 +# LDGG98 KNHC 021200 !grib2/ncep/FORECASTER/#255/201102021200F036/SPED360025PA/10 m HGHT + +NGRID ^([LM]DG.{1,3}) (KNHC) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^LJ[NP][NT]98.*KWNM /Grid/SBN/rawGrib2 +# LJNT98 KWNM 020500 + +# AWIPS1: GRID ^LJPZ98.*KNHC /Grid/SBN/rawGrib2 +# LJPZ98 KNHC 020024 + +NGRID ^(LJNT98) (KWBC|KWNM) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/MPC/GRID180/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + +NGRID ^(LJPN98) (KWNM|KWBC) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/MPC/GRID181/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + +NGRID ^(LJPZ98) (KNHC|KWNM|KWBC) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/TPC/GRID182/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H + +# AWIPS1: GRID ^ETWA88.*KWBI /Grid/SBN/rawGrib2 +# ETWA88 KWBI 010000 !grib2/ncep/SST/#173/201102010000F000/TMPK/0 - NONE + +NGRID ^(ETWA88) (KWBI) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^LAMA98.*KNES /Grid/SBN/rawGrib2 +# LAMA98 KNES 012200 !grib2/ncep/RTMA/#197/201102012201F000/CLD/0-0 - NONE + +NGRID ^(LAMA98) (KNES) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^L.Z.*KWBX /Grid/SBN/rawGrib2 +# LRZY40 KWBX 020000 + +HDS ^([LM].Z.{1,3}) KWBX (..)(..)(..) + PIPE -close /usr/local/ldm/decoders/decrypt_file + /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H + + +EXP ^/data_store/grib2/ECMWF_HiRes/ecmwf_raw/(ecmwf_decrypted.*) + FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H + +# AWIPS1: GRID ^E.[ABCGHI].*KWBJ /Grid/SBN/rawGrib2 +# EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE + +NGRID ^(E.[ABCGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2 +# LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE + +ANY ^([LM].[AB].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2 +# *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. + +ANY ^(LGXT[0-2][0-9]) KNHC (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H + +# AWIPS1: GRID ^LGXP[0-9][0-9].*KNHC /Grid/SBN/rawGrib2 +# *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. + +ANY ^(LGXP[0-9][0-9]) KNHC (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H + +# AWIPS1: GRID ^LDIZ11.*KWNS /Grid/SBN/rawGrib2 +# LDIZ11 KWNS 180039 !grib2/ncep/0/#202/FHRS//LVL + +#ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) +# FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\4\5Z-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^ZETA98.(KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) /Grid/SBN/HydroRaw +# ZETA98 KTAR 012300 /mNWS_160 !grib/nws/NWS_160/#255/201102012200/F001/APCP/sfc/ + +HDS ^(ZETA98) (KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: GRID ^ZDIA98.* /img/SBN/Raw +# ZDIA98 KKCI 030056 /mAWC_NCWD !grib/ncep/AWC_NCWD/#255/201102030056/F000/var202/atmos col/ + +ANY ^(ZDIA98) (....) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3}) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + +# AWIPS1: POINT .*IUPT(0[1-4]).*|.*IUPT40.* /ispan/bufr/profiler +# IUPT01 KBOU 020300 +# AWIPS1: POINT ^IUAK01.* /ispan/bufr/profiler +# IUAK01 PANC 012300 +HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +# AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob +# IUSZ53 KWBC 020205 +# AWIPS1: POINT ^IUSY[4][0-9].* /ispan/bufr/raob +# IUSY41 KWBC 020030 + +HDS ^(IUS(Z[4-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrua/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H + +# AWIPS1: TEXT ^SFUS41.* /ispan/binLightning +# SFUS41 KWBC 012220 + +HDS ^(SF(US|PA)41) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -edex -close /data_store/binlightning/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).nldn.%Y%m%d%H + +# AWIPS1: TEXT ^[ABCFMNRSUVW]......[KPTMC] /text/NO_STORE +# TEXT ^[ABCFMNRSUVW].....[KPTMC] /text/NO_STORE +# TEXT ^DF.* /text/NO_STORE +# TEXT ^T[BCHPRTWXY].* /text/NO_STORE +# *** COME BACK TO THIS *** +IDS|DDPLUS ^(M[A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +IDS|DDPLUS ^(T[BCHPRTWXY][A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/text/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# summaries +#IDS|DDPLUS ^(A.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# Change submitted by Dale Morris +IDS|DDPLUS ^(A[AC-FH-RT-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(AG..[0-9][0-9]) (KWB.) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +#shef +IDS|DDPLUS ^(A[BS]..[0-9][0-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(AG..[0-9][0-9]) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUR|KTUA)(..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(SR..[0-9][0-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# fire wx spot fcst reports +IDS|DDPLUS ^(B.{5}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/fire_wx_spot_fcst_reports/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# climate +IDS|DDPLUS ^(C.{5}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/climate/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# forecast +#IDS|DDPLUS ^(F.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# Change submitted by Dale Morris +IDS|DDPLUS ^(F[A-FH-NP-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(FOUS[1-589].) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +#shef forecasts +IDS|DDPLUS ^(FG..[0-9][0-9]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(FOUS[67].) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# misc adm messages +#IDS|DDPLUS ^(N.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# +# separate out svrwx lsr and GSM misc adm messages +IDS|DDPLUS ^(N[A-VYZ]....) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS[01346-9].) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS5.) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/lsr/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS2.) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/svrwx/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NXUS[0-57-9].) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# xml +IDS|DDPLUS ^(R.{5}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/xml/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# TEXT ^SMUS.* /point/synoptic/Raw +# TEXT ^SMCN.* /point/synoptic/Raw +# TEXT ^SMMX.* /point/synoptic/Raw +IDS|DDPLUS ^(SM[UCM][SNX]..) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/synoptic/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# AWIPS1: TEXT ^S[AP]US[78]0.* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]US4.* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]U[CEMW]6.* /point/metar/Raw +# AWIPS1: TEXT ^SAAK7.* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]CN[345].* /point/metar/Raw +# AWIPS1: TEXT ^SACN8[5679].*KWBC /point/metar/Raw +# AWIPS1: TEXT ^SACN9[0-7].*KWBC /point/metar/Raw +# AWIPS1: TEXT ^S[AP]MX[4].* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]DR3*.* /point/metar/Raw +# AWIPS1: TEXT ^SAPA12.* /point/metar/Raw +# AWIPS1: TEXT ^SAPA[34][01].* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]XX60.* /point/metar/Raw +# AWIPS1: TEXT ^S[AP]RA31.*KWBC /point/metar/Raw +IDS|DDPLUS ^(S[AP].{4}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/metar/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# already included in text pattern +#IDS|DDPLUS ^(SAAK7.) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/metar/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# AWIPS1: RADAR ^SDUS[23578].*|^NXUS6.* /radar/raw +# RADAR ^SDUS3.* /radar/text +# TEXT ^SDUS4([0789].*|[1-6].[^K]*|[1-6].K[^W]*|[1-6].KW[^B]*|[1-6].KWB[^C]*) /radar/text +# ** TO BE LOCALIZED *** + +# already included in text pattern +#IDS|DDPLUS ^(S[AP]CN[345].) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/metar/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# AWIPS1: TEXT ^SMV[DCE].* /point/maritime/Raw +# AWIPS1: TEXT ^SIV[DCE].* /point/maritime/Raw +# AWIPS1: TEXT ^SNV[DCE].* /point/maritime/Raw +# AWIPS1: TEXT ^SSV[DX].* /point/maritime/Raw +# SMVD21 KHAF 021800 +IDS|DDPLUS ^(S[MIN]V[DCE]..|SSV[DX]..) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/maritime/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# AWIPS1: TEXT ^SXUS2[0123].KWNB.* /point/maritime/Raw +# SXUS20 KWNB 022200 RRX +# AWIPS1: TEXT ^VHVD.*KWNB.* /point/maritime/Raw +# VHVD29 KWNB 022340 /pMOBP29 +IDS|DDPLUS ^(SXUS2[0123]|VHVD29) KWNB (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/maritime/(\2:yyyy)(\2:mm)\2/\3/\1_KWNB_\2\3\4_(seq).%Y%m%d%H + + +# SHEF +IDS|DDPLUS ^(SO.{4}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/SHEF/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + + +# AWIPS1: OTHER ^UAUS31.* /point/aircraft/Raw +# AWIPS2 distribution file airep.xml: ^UA(US|PA|NT).. KWBC.* +IDS|DDPLUS ^(UA(US|PA|NT)..) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/airep/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d%H + +# AWIPS1: OTHER ^UBUS[12].* /point/aircraft/Raw +# AWIPS1: OTHER ^UBUS3[15].* /point/aircraft/Raw +# AWIPS2 distribution file pirep.xml: ^UBC.* +IDS|DDPLUS ^(UB.{4}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/pirep/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# raobs +IDS|DDPLUS ^(U[SM].{4}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/raobs/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# upperair +IDS|DDPLUS ^(U[^ABSM].{4}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/upperair/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# MAROB +IDS|DDPLUS ^(V.{5}) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/MAROB/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# TODO: NEEDS A BETTER PATTERN +# warning/watch/advisory +# AWIPS2 distribution file warning.xml +# +# ^(W[FGHOTUW]|FZ)[ACHKMPU][AHKQSWY].* +# ^(WT)(NT|PZ)\d{2} KNHC.* +# ^(WTP)A\d{2} PHFO.* +# ^(NWU)S\d{2} KWNS.* +# +# Change suggested by Dale Morris +IDS|DDPLUS ^(W.....) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/wwa/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# AWIPS1: TEXT ^WAUS4[1-6].* /aiv/advisories/Raw +# WAUS44 KKCI 031822 AAA /pWA4T + +# already included in text pattern +#IDS|DDPLUS ^(WAUS4[1-6]) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/airmet/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# AWIPS1: TEXT ^W[CSV]US0[1-6].* /aiv/advisories/Raw +# WSUS06 KKCI 030129 + +# already included in text pattern +#IDS|DDPLUS ^(W[CSV]US0[1-6]) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/nonconvsigmet/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# AWIPS1: TEXT ^WSUS3[123].* /aiv/convSIGMET/Raw +# WSUS33 KKCI 030055 /pSIGW +# TEXT ^WSUS3[123].* /aiv/convSIGMET/Raw +IDS|DDPLUS ^(WSUS3[123]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/convsigment/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# Aviation patterns : AIRMETS : CONUS +# TEXT ^WAUS4[1-6].* /aiv/advisories/Raw +#IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/airmet/%Y%m%d/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# Aviation patterns : NON-CONVECTIVE SIGMETS : CONUS +# TEXT ^W[CSV]US0[1-6].* /aiv/advisories/Raw +IDS|DDPLUS ^(W[ACSV]US[04][1-6]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/nonconvsigment/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# airmet +IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/airmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# intlsigmets +IDS|DDPLUS ^(W[CSV]PA((0[1-9])|(1[1-3]))) (PHFO) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H +IDS|DDPLUS ^(W[CSV]NT((0[1-9])|(1[1-3]))) (KKCI) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H +IDS|DDPLUS ^(WAAK4[789]) (PAWU) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +# already included in text pattern +#IDS|DDPLUS ^(S[IMN]V[DCE]..|SSV[DX]..) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# already included in text pattern +#IDS|DDPLUS ^(SXUS2[0123]) (KWNB) (..)(..)(..) +# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# already included in text pattern +#IDS|DDPLUS ^(VHVD..) (KWNB) (..)(..)(..) +# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d + +# already included in text pattern +#IDS|DDPLUS ^(SM(US|CN|MX)..) (....) (..)(..)(..) +# FILE -overwrite -log -close /data_store/sfcobs/\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d + +# AWIPS1: POINT ^JSMT2[1-6].* /ispan/bufr/AVN +# AWIPS1: POINT ^JSMT4[1-6].* /ispan/bufr/NGM +# AWIPS1: POINT ^JSMT6[1-6].* /ispan/bufr/MRF +# AWIPS1: POINT ^JSMT7[1-6].KWNO.* /ispan/bufr/MRF +# AWIPS1: POINT ^JSMT7[1-6].KWNH.* /ispan/bufr/HPC +# AWIPS1: POINT ^JSML1[1-6].* /ispan/bufr/ETA +# AWIPS1: POINT ^JSML3[1-6].* /ispan/bufr/GFS +# JSML30 KWNO 021800 + +# AWIPS1: POINT ^JSMF1[1-6].KWNO.* /ispan/bufr/GFSLAMP +# JSMF12 KWNO 022200 +HDS ^(JSM([TL]..|F1[1-6])) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrmos/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H + +# AWIPS1: POINT ^IUAX0[12].* /ispan/bufr/acars +# IUAX02 KARP 022359 + +ANY ^(IUAX0[12]) (....) (..)(..)(..) + PIPE -close /usr/local/ldm/decoders/decrypt_file + /data_store/acars/acars_raw/acars_decrypted_\1_\2_\3\4\5_(seq).%Y%m%d%H + +EXP ^/data_store/acars/acars_raw/(acars_decrypted.*) + FILE -overwrite -log -close -edex /data_store/acars/acars_decrypted/\1.acars.%Y%m%d%H +# Need to make sure that IUAK and IUAX are disallowed. +# IUAK are Alaskan profilers and IUAX has encrypted ACARS handled above! +ANY ^(IUA[^XK]0[12]) (....) (..)(..)(..) + FILE -overwrite -close -edex /data_store/acars/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +# AWIPS1: POINT ^JSAT98.*KKCI.* /aiv/ncwf/Raw +# JSAT98 KKCI 022210 + +HDS ^(JSAT98) (KKCI) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrncwf/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +# AWIPS1: POINT ^JU[BCFJMNOTVW]E(00|9[679]).*KKCI.* /aiv/sigwx/Raw +# JUWE96 KKCI 021800 +HDS ^(JU[BCFJMNOTVW]E(00|9[679])) KKCI (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrsigwx/(\3:yyyy)(\3:mm)\3/\4/\1_KKCI_\3\4\5_(seq).bufr.%Y%m%d%H + +## Hydro portion created during automation ## + +## Model Bufr Patterns ## +# From modelBufrAcq_patterns.template +# Localized if modelBufrClip.sup exists -- going to just add all for now + +# AWIPS1: POINT ^JUSA41.KWNO* /ispan/bufr/modelSoundings/NAM +# POINT ^JUSA41.KWBC* /ispan/bufr/modelSoundings/GFS +# JUSA42 KWNO 070200 +HDS ^(JUS[ABX]4[1-9]) (KW(NO|BC)) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/mdlsndg/(\4:yyyy)(\4:mm)\4/\5/\1_\2_\4\5\6_(seq).bufr.%Y%m%d%H + +## GOES Bufr Patterns ## +# From goesBufrAcq_patterns.template +# Localized if goesBufrClip.sup exists -- going to just add all for now + +# AWIPS1: POINT ^JUTX01.* /ispan/bufr/GOESSoundings +# +# JUTX05 KNES 070326 RRN +HDS ^(JUTX0[1-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/goessndg/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +## POES Bufr Patterns ## +# From poesBufrAcq_patterns.template +# Localized if poesBufrClip.sup exists -- going to just add all for now + +# AWIPS1: POINT ^IUTX01.* /ispan/bufr/POESSoundings +# IUTX01 KNES 070307 +HDS ^(IUTX0[1-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/poessndg/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +## HDW Bufr Patterns ## +# From [east|west]HDWBufrAcq_patterns.template # +### From Automation ### + +# AWIPS1: POINT ^J[CGJMPR]CX[0-9]1.* /ispan/bufr/HDW +# AWIPS2 distribution file bufrhdw.xml: ^J[ACEGHJKMNPQR]CX[1-9]1.* +HDS ^(J[ACEGHJKMNPQR]CX[1-9]1) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrhdw/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +# AWIPS2 distribution file bufrssmi.xml: ^ISXA.* +HDS ^(ISXA..) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrssmi/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + +# AWIPS2 distribution file bufrascat.xml: ^JSXX(0[1-9]|10).* +HDS ^(JSXX(0[1-9]|10)) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrascat/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H + +# AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).* +HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/bufrmthdw/(\5:yyyy)(\5:mm)\5/\6/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template index 30d0479e80..fd895b2376 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -4,6 +4,7 @@ # ------------ ---------- ----------- -------------------------- # 20120905 1090 jkorman Corrected several patterns as well as # combining similar patterns. +#20121009 1252 jkorman Corrections and additions from Dale Morris. #*************************************************************** # AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw # PGNA00 KWNS 010001 !redbook 1_1/NMCGPHMCD/MCDSUM/PXSF001CN/20110201 0001 @@ -64,9 +65,8 @@ HDS ^(Z[DE]W[A-D][89]8) KWNO (..)(..)(..) /m0 !(grib|grib2)/[^/]*/([^/]*)/#([^/] # AWIPS1: GRID ^[YZ].[A-WYZ].*KWB.* /Grid/SBN/Raw # YUWG97 KWBG 010600 /mRUC2 !grib/ncep/RUC2/#236/201102010600/F006/UGRD/tropopause/ - HDS ^([YZ].[A-WYZ].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\5.%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^YEI.[89]8.*KWNH /Grid/SBN/Raw #!MAINT! This line is a superset duplicate of line 16 (which only triggers on /ncep/) - However cannot find any data matching this pattern. @@ -75,7 +75,7 @@ HDS ^(YEI.[89]8) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0- # This line enables the regional rfc qpf gribs HDS ^(YEI.[89]8) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUA) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/[^/]*/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)/\3/\4/\7/GRID\8/(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^ZEX.98.*KWNH /Grid/SBN/Raw @@ -266,19 +266,21 @@ ANY ^([LM].[AB].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/ # *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. ANY ^(LGXT[0-2][0-9]) KNHC (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H # AWIPS1: GRID ^LGXP[0-9][0-9].*KNHC /Grid/SBN/rawGrib2 # *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. ANY ^(LGXP[0-9][0-9]) KNHC (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H # AWIPS1: GRID ^LDIZ11.*KWNS /Grid/SBN/rawGrib2 # LDIZ11 KWNS 180039 !grib2/ncep/0/#202/FHRS//LVL -ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\4/\5Z_\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +#ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) +# FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\4\5Z-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H # AWIPS1: GRID ^ZETA98.(KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) /Grid/SBN/HydroRaw # ZETA98 KTAR 012300 /mNWS_160 !grib/nws/NWS_160/#255/201102012200/F001/APCP/sfc/ @@ -297,7 +299,7 @@ ANY ^(ZDIA98) (....) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9 # AWIPS1: POINT ^IUAK01.* /ispan/bufr/profiler # IUAK01 PANC 012300 HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob # IUSZ53 KWBC 020205 @@ -325,8 +327,20 @@ IDS|DDPLUS ^(T[BCHPRTWXY][A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/text/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d # summaries -IDS|DDPLUS ^(A.{5}) (.{4}) (..)(..)(..) +#IDS|DDPLUS ^(A.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# Change submitted by Dale Morris +IDS|DDPLUS ^(A[AC-FH-RT-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(AG..[0-9][0-9]) (KWB.) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +#shef +IDS|DDPLUS ^(A[BS]..[0-9][0-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(AG..[0-9][0-9]) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUR|KTUA)(..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(SR..[0-9][0-9]) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # fire wx spot fcst reports IDS|DDPLUS ^(B.{5}) (.{4}) (..)(..)(..) @@ -337,11 +351,33 @@ IDS|DDPLUS ^(C.{5}) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/climate/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # forecast -IDS|DDPLUS ^(F.{5}) (.{4}) (..)(..)(..) +#IDS|DDPLUS ^(F.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# Change submitted by Dale Morris +IDS|DDPLUS ^(F[A-FH-NP-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(FOUS[1-589].) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +#shef forecasts +IDS|DDPLUS ^(FG..[0-9][0-9]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(FOUS[67].) (....) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # misc adm messages -IDS|DDPLUS ^(N.{5}) (.{4}) (..)(..)(..) +#IDS|DDPLUS ^(N.{5}) (.{4}) (..)(..)(..) +# FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# +# separate out svrwx lsr and GSM misc adm messages +IDS|DDPLUS ^(N[A-VYZ]....) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS[01346-9].) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS5.) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/lsr/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NWUS2.) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/svrwx/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(NXUS[0-57-9].) (....) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # xml @@ -435,9 +471,10 @@ IDS|DDPLUS ^(V.{5}) (.{4}) (..)(..)(..) # ^(WT)(NT|PZ)\d{2} KNHC.* # ^(WTP)A\d{2} PHFO.* # ^(NWU)S\d{2} KWNS.* -# +# +# Change suggested by Dale Morris IDS|DDPLUS ^(W.....) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/warning/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -log -close -edex /data_store/wwa/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # AWIPS1: TEXT ^WAUS4[1-6].* /aiv/advisories/Raw # WAUS44 KKCI 031822 AAA /pWA4T @@ -469,6 +506,19 @@ IDS|DDPLUS ^(WSUS3[123]) (.{4}) (..)(..)(..) IDS|DDPLUS ^(W[ACSV]US[04][1-6]) (.{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/nonconvsigment/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# airmet +IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/airmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# intlsigmets +IDS|DDPLUS ^(W[CSV]PA((0[1-9])|(1[1-3]))) (PHFO) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H +IDS|DDPLUS ^(W[CSV]NT((0[1-9])|(1[1-3]))) (KKCI) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H +IDS|DDPLUS ^(WAAK4[789]) (PAWU) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + # already included in text pattern #IDS|DDPLUS ^(S[IMN]V[DCE]..|SSV[DX]..) (....) (..)(..)(..) # FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d @@ -508,8 +558,9 @@ ANY ^(IUAX0[12]) (....) (..)(..)(..) EXP ^/data_store/acars/acars_raw/(acars_decrypted.*) FILE -overwrite -log -close -edex /data_store/acars/acars_decrypted/\1.acars.%Y%m%d%H - -ANY ^(IUA[^X]0[12]) (....) (..)(..)(..) +# Need to make sure that IUAK and IUAX are disallowed. +# IUAK are Alaskan profilers and IUAX has encrypted ACARS handled above! +ANY ^(IUA[^XK]0[12]) (....) (..)(..)(..) FILE -overwrite -close -edex /data_store/acars/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # AWIPS1: POINT ^JSAT98.*KKCI.* /aiv/ncwf/Raw @@ -554,7 +605,7 @@ HDS ^(JUTX0[1-9]) (....) (..)(..)(..) HDS ^(IUTX0[1-9]) (....) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/poessndg/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H -## HDW Bufr Patters ## +## HDW Bufr Patterns ## # From [east|west]HDWBufrAcq_patterns.template # ### From Automation ### From 24267b6661c9255e758067b6676acc48222a8e91 Mon Sep 17 00:00:00 2001 From: James Korman Date: Fri, 12 Oct 2012 14:46:32 -0500 Subject: [PATCH 2/5] Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37 Former-commit-id: 3ce7b04eabfcd051f0cd7d73c79fc2c96afb2160 [formerly c2a4c48f5df6b852d871b7caf1082e801ca2baf6] [formerly aca18f0a37e9093290c6c7c0e507ea63bd3053ca] [formerly fd783767b2b91625c90f750dc3ef37f10e7e974c [formerly aca18f0a37e9093290c6c7c0e507ea63bd3053ca [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]] Former-commit-id: fd783767b2b91625c90f750dc3ef37f10e7e974c Former-commit-id: 2f58ca4e29b7cc53c712e241e9b070c4f6a99bf1 [formerly 31be9c204de581f740516add746f6dff2f5a2398] Former-commit-id: 83bd2e28c4dabca3f97484bcacb49efdf7e7ce65 --- .../Installer.ldm/patch/etc/new_pqact.txt | 627 ------------------ 1 file changed, 627 deletions(-) delete mode 100644 rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt b/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt deleted file mode 100644 index fd895b2376..0000000000 --- a/rpms/awips2.core/Installer.ldm/patch/etc/new_pqact.txt +++ /dev/null @@ -1,627 +0,0 @@ -# /-\-/-\-/-\-/-\- acq_patterns.template /-\-/-\-/-\-/-\- -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# 20120905 1090 jkorman Corrected several patterns as well as -# combining similar patterns. -#20121009 1252 jkorman Corrections and additions from Dale Morris. -#*************************************************************** -# AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw -# PGNA00 KWNS 010001 !redbook 1_1/NMCGPHMCD/MCDSUM/PXSF001CN/20110201 0001 -ANY ^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8}) - FILE -overwrite -log -close -edex /data_store/redbook/(\3:yyyy)(\3:mm)\3/\4/\8/\4\5Z_\8_\7_\6-\1_\2_(seq).rb.%Y%m%d%H - -# AWIPS 1 PATTERN IMAGE ^T.* /sat/SBN/Raw -# satz/ch2/GOES-11/WV/20110201 1830/NHEM-COMP/24km/ TIGF05 KNES 011830 -NIMAGE ^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/sat/(\(10):yyyy)(\(10):mm)\(10)/\(11)/\2/\(11)\(12)Z_\3_\7_\6_\8_\9_(seq).satz.%Y%m%d%H - -# AWIPS 1 PATTERN GRID ^YEI.[89]8.*KWNH /img/SBN/Raw -# YEIN98 KWNH 011800 /mRFC_QPF !grib/ncep/RFC_QPF/#218/201102011800/F018/APCP/sfc/ -#!MAINT! This line is a subset duplicate of line 68 - However cannot find any data matching this pattern. -HDS ^(YEI.[89]8) KWNH (..)(..)(..)[^!]*!(grib|grib2)/ncep/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS 1 GRID ^ZETA98.*K[NW][EN][ES] /img/SBN/Raw -# ZETA98 KNES 011516 /mNWS_190 !grib/nws/NWS_190/#255/201102011400/F001/APCP/sfc/ -# ZETA98 KWNE 311200 /mRFC_QPE !grib/ncep/RFC_QPE/#240/201101311200/F006/APCP/sfc/ -HDS ^(ZETA98) (K[NW][EN][ES]) (..)(..)(..)([^!]*)!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/([^/]*)/([^/]*) - FILE -overwrite -log -close -edex /data_store/\7/(\3:yyyy)(\3:mm)\3/\4/\8/GRID\9/\(11)Z_\(12)_\(13)-\1_\2_\3\4\5_(seq).\7.%Y%m%d%H - -# AWIPS 1 GRID ^ZEGA98.*KNES /img/SBN/Raw -# -ANY ^(ZEGA98) (KNES) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/misc/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# AWIPS 1: GRID ^ZEGZ98.*K.* /img/SBN/Raw -# ZEGZ98 KORN 011927 /mNWS_151 !grib/nws/NWS_151/#255/201102011800/F024/CNWAT/sfc/ -# ZEGZ98 KEY 1HR=HPBL, 3HR=5WAVH, 6HR=CNWAT -HDS ^(ZEGZ98) (K.{3}) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS 1: GRID ^[YZ][ES]QA88.*KMSR /img/SBN/Raw -# YSQA88 KMSR 011220 /mNWS_185 !grib/nws/NWS_185/#255/201102010600/F000/MSTAV/sfc/ -# YEQA88 KMSR 011210 !grib2/nws/NWS_255/#255/201102010600F000/WEASD/0 - -HDS ^([YZ][ES]QA88) KMSR (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KMSR_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS 1: GRID ^HAXA00.*KWBC /img/SBN/Raw -# HAXA00 KWBC 312349 /mNWS_0 !grib/nwstg/NWS_0/#255/201101312349/F000/RDSP1/sfc/ - -HDS ^HAXA00 KWBC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\4/(\1:yyyy)(\1:mm)\1/\2/\5/GRID\6/\8Z_\9_\(10)-HAXA00_KWBC_\1\2\3_(seq).\4.%Y%m%d%H - -# AWIPS 1: GRID ^ZDWA88.*KWNO /img/SBN/Raw -# GRID ^ZDWB88.*KWNO /img/SBN/Raw -# GRID ^ZDWC88.*KWNO /img/SBN/Raw -# GRID ^ZDWD88.*KWNO /img/SBN/Raw -# GRID ^ZEWD88.*KWNO /img/SBN/Raw -# GRID ^ZDWD98.*KWNO /img/SBN/Raw -# ZDWA88 KWNO 011400 /m0 !grib/ncep/0/#236/201102011400/F003/U-GWD/0 m above gnd/ - -HDS ^(Z[DE]W[A-D][89]8) KWNO (..)(..)(..) /m0 !(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/3hr/GRID\7/\9Z_\(10)_\(11)-\1_KWNO_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^[YZ].[A-WYZ].*KWB.* /Grid/SBN/Raw -# YUWG97 KWBG 010600 /mRUC2 !grib/ncep/RUC2/#236/201102010600/F006/UGRD/tropopause/ -HDS ^([YZ].[A-WYZ].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^YEI.[89]8.*KWNH /Grid/SBN/Raw -#!MAINT! This line is a superset duplicate of line 16 (which only triggers on /ncep/) - However cannot find any data matching this pattern. -HDS ^(YEI.[89]8) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H - -# This line enables the regional rfc qpf gribs -HDS ^(YEI.[89]8) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUA) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/[^/]*/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - - -# AWIPS1: GRID ^ZEX.98.*KWNH /Grid/SBN/Raw -# ZEXM98 KWNH 020000 /mNCEP_QPF !grib/ncep/NCEP_QPF/#218/201102020000/F072/APCP/sfc/ - -HDS ^(ZEX.98) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNH_\2\3\4_(seq).\5.%Y%m%d%H - -## -- ECMF, UKMET, MRF -- ## - -# AWIPS1: GRID ^H.[A-H].*ECMF /Grid/SBN/Raw -# HVAS50 ECMF 011200 /mECMWF_139 !grib/ecmwf/ECMWF_139/#001/201102011200/F168/VGRD/500 mb/ - -HDS ^(H.[A-H].{1,3}) ECMF (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_ECMF_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^H.[I-L].*EGRR /Grid/SBN/Raw -# AWIPS1: GRID ^H.[I-L].*KWBK /Grid/SBN/Raw -# HVKH30 EGRR 011200 /mUKM_45 !grib/ukmet/UKM_45/#039/201102011200/F042/VGRD/300 mb/ -# HTJA85 KWBK 010000 /mSSIGFS !grib/ncep/SSIGFS/#038/201102010000/F000/TMP/850 mb/ -# HHJA85 KWBK 010000 /mSPEC62MRF !grib/ncep/SPEC62MRF/#038/201102010000/F000/HGT/850 mb/ - -HDS ^(H.[I-L].{1,3}) (EGRR|KWBK) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^H.X.*KNWC /Grid/SBN/Raw -# *** NOT FOUND IN INGEST STREAM *** - -ANY ^(H.X...) KNWC (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib/(\2:yyyy)(\2:mm)\2/\3/MISC/\1_KNWC_\2\3\4_(seq).grib.%Y%m%d%H - -# AWIPS1: GRID ^O.[JMNQ].*KWBJ /Grid/SBN/Raw -# ONQZ88 KWBJ 020000 /mNWW_124 !grib/ncep/NWW_124/#253/201102020000/F108/WVDIR/sfc/ - -HDS ^(O.[JMNQ].{1,3}) KWBJ (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBJ_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^O.N.*KWBM /Grid/SBN/Raw -# OENA88 KWBM 020000 /mICE_120 !grib/ncep/ICE_120/#219/201102020000/F000/ICEC/MSL/ -#HDS ^(O.N.{1,3}) KWBM (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) -# FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBM_\2\3\4_(seq).\5.%Y%m%d%H -# -# AWIPS1: GRID ^O.L.*KWBI /Grid/SBN/Raw -# OTLA88 KWBI 010000 /mSST !grib/ncep/SST/#235/201102010000/F000/TMP/sfc/ -#HDS ^(O.L.{1,3}) KWBI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) -# FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWBI_\2\3\4_(seq).\5.%Y%m%d%H -#!MAINT! Combined the above two patterns into one. The only difference was KWBM vs KWBI -HDS ^(O.N.{1,3}) (KWBM|KWBI) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^OEBA88.*KNWC /Grid/SBN/Raw -# OEBA88 KNWC 271200 /m120 !grib/noc/120/#255/201101270000/F000/ICEC/sfc/ -# FNMOC Seasonal Great Lakes Ice edge gridded data. -HDS ^(OEBA88) KNWC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/ICE/GRID\7/\9Z_\(10)_\(11)-\1_KNWC_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^[YZ][UV]M.98.*KNHC /Grid/SBN/Raw -# *** NOT FOUND IN INGEST STREAM *** - -ANY ^([YZ][UV]M.98) KNHC (..)(..)(..)[^!]*!(grib|grib2) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/TPCTcm/\1_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^H[ET]QV[01][0-9].*KWNC /Grid/SBN/Raw -# HEQV01 KWNC 151200 /mFORECASTER !grib/ncep/FORECASTER/#211/201012150100/F000/CLWMR/sfc/ -# NCEP/CPC Precipitation and Temperature anomaly -# *** NOT FOUND IN INGEST STREAM *** -ANY ^(H[ET]QV[01][0-9]) KWNC (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KWNC_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^Y[IJL]XA[0-9][0-9].*KKCI /Grid/SBN/Raw -# YIXA48 KKCI 012300 /mAWC_CIP !grib/ncep/AWC_CIP/#252/201102012300/F000/NLAT/5791 m above MSL/ - -HDS ^(Y[IJL]XA[0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^YAW[BCDGJM][0-9][0-9].*KKCI /Grid/SBN/Raw -# YAWB43 KKCI 012200 /mAWC_CIP !grib/ncep/AWC_CIP/#252/201102012200/F001/NLAT/6705 m above MSL/ - -HDS ^(YAW[BCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^YVW[ABCDGJM][0-9][0-9].*KKCI /Grid/SBN/Raw -# YVWA41 KKCI 012200 /mRUC2 !grib/ncep/RUC2/#255/201102012200/F000/TURB/7010 m above MSL/ - -HDS ^(YVW[ABCDGJM][0-9][0-9]) KKCI (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\5/(\2:yyyy)(\2:mm)\2/\3/\6/GRID\7/\9Z_\(10)_\(11)-\1_KKCI_\2\3\4_(seq).\5.%Y%m%d%H - -# AWIPS1: GRID ^[LM].[ABDHMNRSTU].*KWB.* /Grid/SBN/rawGrib2 -# LTHO70 KWBC 011800 !grib2/ncep/GFS/#213/201102011800F120/TMPK/700 hPa PRES - -NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# MosGuidance, perhaps others? -# LVUC00 KWBQ 271200 !grib2/ncep/GFS/#197/FHRS//LVL -# Maint : fixed pattern at F... -HDS ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^[LM].[MN].98.*KWNH /Grid/SBN/rawGrib2 -# LEMG98 KWNH 020600 !grib2/ncep/NCEP_QPF/#001/201102020600F036/P06M/0 - NONE - -NGRID ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H -HDS ^([LM].[MN].98) (KWNH) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^[LM].E.*KWBD* /Grid/SBN/rawGrib2 -# MUEU98 KWBD 020600 !grib2/ncep/DGEX_115/#185/201102020600F090/UREL/10 m HGHT -NGRID ^([LM].E.{1,3}) (KWBD) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^L.U.*KWBN* /Grid/SBN/rawGrib2 -# LAUE06 KWBN 021200 !grib2/ncep/NDFD/#197/201102021200F096/CLD/0 - NONE - -#NGRID ^(L.U.*) (KWBN) (..)(..)(..) .*!(grib|grib2)/.*/(.*)/#(.*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) -# FILE -overwrite -log -close -edex /data_store/\6/GRID\8/\7/\9/\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d - -# AWIPS1: GRID ^L[AB]U[ABC].*KWNO* /Grid/SBN/rawGrib2 -# LBUB05 KWNO 012200 !grib2/ncep/LAMP/#197/201102012200F007/CTSTM02/0 - NONE - -NGRID ^(L[AB]U[ABC].{1,3}) (KWNO) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^L[UV]I.*KWBJ* /Grid/SBN/rawGrib2 -# LVIB88 KWBJ 011800 !grib2/ncep/GFS/#255/201102011800F003/VSBY/10 m HGHT - -NGRID ^(L[UV]I.{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^[LM]DG.*KNHC* /Grid/SBN/rawGrib2 -# LDGG98 KNHC 021200 !grib2/ncep/FORECASTER/#255/201102021200F036/SPED360025PA/10 m HGHT - -NGRID ^([LM]DG.{1,3}) (KNHC) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^LJ[NP][NT]98.*KWNM /Grid/SBN/rawGrib2 -# LJNT98 KWNM 020500 - -# AWIPS1: GRID ^LJPZ98.*KNHC /Grid/SBN/rawGrib2 -# LJPZ98 KNHC 020024 - -NGRID ^(LJNT98) (KWBC|KWNM) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/MPC/GRID180/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H - -NGRID ^(LJPN98) (KWNM|KWBC) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/MPC/GRID181/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H - -NGRID ^(LJPZ98) (KNHC|KWNM|KWBC) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/TPC/GRID182/\4\5Z_opcWave-\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H - -# AWIPS1: GRID ^ETWA88.*KWBI /Grid/SBN/rawGrib2 -# ETWA88 KWBI 010000 !grib2/ncep/SST/#173/201102010000F000/TMPK/0 - NONE - -NGRID ^(ETWA88) (KWBI) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^LAMA98.*KNES /Grid/SBN/rawGrib2 -# LAMA98 KNES 012200 !grib2/ncep/RTMA/#197/201102012201F000/CLD/0-0 - NONE - -NGRID ^(LAMA98) (KNES) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^L.Z.*KWBX /Grid/SBN/rawGrib2 -# LRZY40 KWBX 020000 - -HDS ^([LM].Z.{1,3}) KWBX (..)(..)(..) - PIPE -close /usr/local/ldm/decoders/decrypt_file - /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H - - -EXP ^/data_store/grib2/ECMWF_HiRes/ecmwf_raw/(ecmwf_decrypted.*) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/ECMWF_HiRes/\1_KWBX_\2\3\4_(seq).grib2.%Y%m%d%H - -# AWIPS1: GRID ^E.[ABCGHI].*KWBJ /Grid/SBN/rawGrib2 -# EWAW88 KWBJ 021200 !grib2/ncep/GMGWM/#255/201102021200F180/WSTP/0 - NONE - -NGRID ^(E.[ABCGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2 -# LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE - -ANY ^([LM].[AB].{1,3}) (KWBS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^LGXT[0-2][0-9].*KNHC /Grid/SBN/rawGrib2 -# *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. - -ANY ^(LGXT[0-2][0-9]) KNHC (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H - -# AWIPS1: GRID ^LGXP[0-9][0-9].*KNHC /Grid/SBN/rawGrib2 -# *** This is only be available during an active storm. Verified 20120828 - Hurricane Isaac. - -ANY ^(LGXP[0-9][0-9]) KNHC (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\2:yyyy)(\2:mm)\2/\3/TPC/\3\4Z_SURGE-\1_KNHC_\2\3\4_(seq).grib2.%Y%m%d%H - -# AWIPS1: GRID ^LDIZ11.*KWNS /Grid/SBN/rawGrib2 -# LDIZ11 KWNS 180039 !grib2/ncep/0/#202/FHRS//LVL - -#ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([^/]*) -# FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\4\5Z-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H -ANY ^(LDIZ1[1-9]|LDIZ2[7-9]|LDIZ3[0789]|LDIZ4[0-1]) (KWNS) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/[^/]*/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/SPC/GRID\7/\9Z_\(10)_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^ZETA98.(KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) /Grid/SBN/HydroRaw -# ZETA98 KTAR 012300 /mNWS_160 !grib/nws/NWS_160/#255/201102012200/F001/APCP/sfc/ - -HDS ^(ZETA98) (KTUA|PACR|KSTR|KRSA|KORN|KRHA|KKRF|KMSR|KTAR|KPTR|KTIR|KALR|KFWR) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: GRID ^ZDIA98.* /img/SBN/Raw -# ZDIA98 KKCI 030056 /mAWC_NCWD !grib/ncep/AWC_NCWD/#255/201102030056/F000/var202/atmos col/ - -ANY ^(ZDIA98) (....) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3}) - FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H - -# AWIPS1: POINT .*IUPT(0[1-4]).*|.*IUPT40.* /ispan/bufr/profiler -# IUPT01 KBOU 020300 -# AWIPS1: POINT ^IUAK01.* /ispan/bufr/profiler -# IUAK01 PANC 012300 -HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/profiler/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -# AWIPS1: POINT ^IUSZ[4-9][0-9].* /ispan/bufr/raob -# IUSZ53 KWBC 020205 -# AWIPS1: POINT ^IUSY[4][0-9].* /ispan/bufr/raob -# IUSY41 KWBC 020030 - -HDS ^(IUS(Z[4-9]|Y4)[0-9]) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrua/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H - -# AWIPS1: TEXT ^SFUS41.* /ispan/binLightning -# SFUS41 KWBC 012220 - -HDS ^(SF(US|PA)41) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -log -edex -close /data_store/binlightning/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).nldn.%Y%m%d%H - -# AWIPS1: TEXT ^[ABCFMNRSUVW]......[KPTMC] /text/NO_STORE -# TEXT ^[ABCFMNRSUVW].....[KPTMC] /text/NO_STORE -# TEXT ^DF.* /text/NO_STORE -# TEXT ^T[BCHPRTWXY].* /text/NO_STORE -# *** COME BACK TO THIS *** -IDS|DDPLUS ^(M[A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -IDS|DDPLUS ^(T[BCHPRTWXY][A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/text/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# summaries -#IDS|DDPLUS ^(A.{5}) (.{4}) (..)(..)(..) -# FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -# Change submitted by Dale Morris -IDS|DDPLUS ^(A[AC-FH-RT-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(AG..[0-9][0-9]) (KWB.) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -#shef -IDS|DDPLUS ^(A[BS]..[0-9][0-9]) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(AG..[0-9][0-9]) (KALR|KFWR|KKRF|KMSR|KORN|KPTR|KRHA|KRSA|KSTR|KTAR|KTIR|KTUR|KTUA)(..)(..)(..) - FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(SR..[0-9][0-9]) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# fire wx spot fcst reports -IDS|DDPLUS ^(B.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/fire_wx_spot_fcst_reports/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# climate -IDS|DDPLUS ^(C.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/climate/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# forecast -#IDS|DDPLUS ^(F.{5}) (.{4}) (..)(..)(..) -# FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -# Change submitted by Dale Morris -IDS|DDPLUS ^(F[A-FH-NP-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(FOUS[1-589].) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -#shef forecasts -IDS|DDPLUS ^(FG..[0-9][0-9]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(FOUS[67].) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/shef/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# misc adm messages -#IDS|DDPLUS ^(N.{5}) (.{4}) (..)(..)(..) -# FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -# -# separate out svrwx lsr and GSM misc adm messages -IDS|DDPLUS ^(N[A-VYZ]....) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(NWUS[01346-9].) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(NWUS5.) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/lsr/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(NWUS2.) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/svrwx/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(NXUS[0-57-9].) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# xml -IDS|DDPLUS ^(R.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/xml/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# TEXT ^SMUS.* /point/synoptic/Raw -# TEXT ^SMCN.* /point/synoptic/Raw -# TEXT ^SMMX.* /point/synoptic/Raw -IDS|DDPLUS ^(SM[UCM][SNX]..) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/synoptic/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# AWIPS1: TEXT ^S[AP]US[78]0.* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]US4.* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]U[CEMW]6.* /point/metar/Raw -# AWIPS1: TEXT ^SAAK7.* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]CN[345].* /point/metar/Raw -# AWIPS1: TEXT ^SACN8[5679].*KWBC /point/metar/Raw -# AWIPS1: TEXT ^SACN9[0-7].*KWBC /point/metar/Raw -# AWIPS1: TEXT ^S[AP]MX[4].* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]DR3*.* /point/metar/Raw -# AWIPS1: TEXT ^SAPA12.* /point/metar/Raw -# AWIPS1: TEXT ^SAPA[34][01].* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]XX60.* /point/metar/Raw -# AWIPS1: TEXT ^S[AP]RA31.*KWBC /point/metar/Raw -IDS|DDPLUS ^(S[AP].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/metar/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# already included in text pattern -#IDS|DDPLUS ^(SAAK7.) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/metar/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# AWIPS1: RADAR ^SDUS[23578].*|^NXUS6.* /radar/raw -# RADAR ^SDUS3.* /radar/text -# TEXT ^SDUS4([0789].*|[1-6].[^K]*|[1-6].K[^W]*|[1-6].KW[^B]*|[1-6].KWB[^C]*) /radar/text -# ** TO BE LOCALIZED *** - -# already included in text pattern -#IDS|DDPLUS ^(S[AP]CN[345].) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/metar/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# AWIPS1: TEXT ^SMV[DCE].* /point/maritime/Raw -# AWIPS1: TEXT ^SIV[DCE].* /point/maritime/Raw -# AWIPS1: TEXT ^SNV[DCE].* /point/maritime/Raw -# AWIPS1: TEXT ^SSV[DX].* /point/maritime/Raw -# SMVD21 KHAF 021800 -IDS|DDPLUS ^(S[MIN]V[DCE]..|SSV[DX]..) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/maritime/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# AWIPS1: TEXT ^SXUS2[0123].KWNB.* /point/maritime/Raw -# SXUS20 KWNB 022200 RRX -# AWIPS1: TEXT ^VHVD.*KWNB.* /point/maritime/Raw -# VHVD29 KWNB 022340 /pMOBP29 -IDS|DDPLUS ^(SXUS2[0123]|VHVD29) KWNB (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/maritime/(\2:yyyy)(\2:mm)\2/\3/\1_KWNB_\2\3\4_(seq).%Y%m%d%H - - -# SHEF -IDS|DDPLUS ^(SO.{4}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/SHEF/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - - -# AWIPS1: OTHER ^UAUS31.* /point/aircraft/Raw -# AWIPS2 distribution file airep.xml: ^UA(US|PA|NT).. KWBC.* -IDS|DDPLUS ^(UA(US|PA|NT)..) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/airep/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d%H - -# AWIPS1: OTHER ^UBUS[12].* /point/aircraft/Raw -# AWIPS1: OTHER ^UBUS3[15].* /point/aircraft/Raw -# AWIPS2 distribution file pirep.xml: ^UBC.* -IDS|DDPLUS ^(UB.{4}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/pirep/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# raobs -IDS|DDPLUS ^(U[SM].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/raobs/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# upperair -IDS|DDPLUS ^(U[^ABSM].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/upperair/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# MAROB -IDS|DDPLUS ^(V.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/MAROB/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# TODO: NEEDS A BETTER PATTERN -# warning/watch/advisory -# AWIPS2 distribution file warning.xml -# -# ^(W[FGHOTUW]|FZ)[ACHKMPU][AHKQSWY].* -# ^(WT)(NT|PZ)\d{2} KNHC.* -# ^(WTP)A\d{2} PHFO.* -# ^(NWU)S\d{2} KWNS.* -# -# Change suggested by Dale Morris -IDS|DDPLUS ^(W.....) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/wwa/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# AWIPS1: TEXT ^WAUS4[1-6].* /aiv/advisories/Raw -# WAUS44 KKCI 031822 AAA /pWA4T - -# already included in text pattern -#IDS|DDPLUS ^(WAUS4[1-6]) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/airmet/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# AWIPS1: TEXT ^W[CSV]US0[1-6].* /aiv/advisories/Raw -# WSUS06 KKCI 030129 - -# already included in text pattern -#IDS|DDPLUS ^(W[CSV]US0[1-6]) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/nonconvsigmet/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# AWIPS1: TEXT ^WSUS3[123].* /aiv/convSIGMET/Raw -# WSUS33 KKCI 030055 /pSIGW -# TEXT ^WSUS3[123].* /aiv/convSIGMET/Raw -IDS|DDPLUS ^(WSUS3[123]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/convsigment/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# Aviation patterns : AIRMETS : CONUS -# TEXT ^WAUS4[1-6].* /aiv/advisories/Raw -#IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) -# FILE -overwrite -log -close -edex /data_store/airmet/%Y%m%d/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# Aviation patterns : NON-CONVECTIVE SIGMETS : CONUS -# TEXT ^W[CSV]US0[1-6].* /aiv/advisories/Raw -IDS|DDPLUS ^(W[ACSV]US[04][1-6]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/nonconvsigment/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# airmet -IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/airmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -# intlsigmets -IDS|DDPLUS ^(W[CSV]PA((0[1-9])|(1[1-3]))) (PHFO) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H -IDS|DDPLUS ^(W[CSV]NT((0[1-9])|(1[1-3]))) (KKCI) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\4/\1_\5_\6\7\8_(seq).%Y%m%d%H -IDS|DDPLUS ^(WAAK4[789]) (PAWU) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H -IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H - -# already included in text pattern -#IDS|DDPLUS ^(S[IMN]V[DCE]..|SSV[DX]..) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# already included in text pattern -#IDS|DDPLUS ^(SXUS2[0123]) (KWNB) (..)(..)(..) -# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# already included in text pattern -#IDS|DDPLUS ^(VHVD..) (KWNB) (..)(..)(..) -# FILE -overwrite -log -close /data_store/sfcobs/\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d - -# already included in text pattern -#IDS|DDPLUS ^(SM(US|CN|MX)..) (....) (..)(..)(..) -# FILE -overwrite -log -close /data_store/sfcobs/\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d - -# AWIPS1: POINT ^JSMT2[1-6].* /ispan/bufr/AVN -# AWIPS1: POINT ^JSMT4[1-6].* /ispan/bufr/NGM -# AWIPS1: POINT ^JSMT6[1-6].* /ispan/bufr/MRF -# AWIPS1: POINT ^JSMT7[1-6].KWNO.* /ispan/bufr/MRF -# AWIPS1: POINT ^JSMT7[1-6].KWNH.* /ispan/bufr/HPC -# AWIPS1: POINT ^JSML1[1-6].* /ispan/bufr/ETA -# AWIPS1: POINT ^JSML3[1-6].* /ispan/bufr/GFS -# JSML30 KWNO 021800 - -# AWIPS1: POINT ^JSMF1[1-6].KWNO.* /ispan/bufr/GFSLAMP -# JSMF12 KWNO 022200 -HDS ^(JSM([TL]..|F1[1-6])) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrmos/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H - -# AWIPS1: POINT ^IUAX0[12].* /ispan/bufr/acars -# IUAX02 KARP 022359 - -ANY ^(IUAX0[12]) (....) (..)(..)(..) - PIPE -close /usr/local/ldm/decoders/decrypt_file - /data_store/acars/acars_raw/acars_decrypted_\1_\2_\3\4\5_(seq).%Y%m%d%H - -EXP ^/data_store/acars/acars_raw/(acars_decrypted.*) - FILE -overwrite -log -close -edex /data_store/acars/acars_decrypted/\1.acars.%Y%m%d%H -# Need to make sure that IUAK and IUAX are disallowed. -# IUAK are Alaskan profilers and IUAX has encrypted ACARS handled above! -ANY ^(IUA[^XK]0[12]) (....) (..)(..)(..) - FILE -overwrite -close -edex /data_store/acars/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -# AWIPS1: POINT ^JSAT98.*KKCI.* /aiv/ncwf/Raw -# JSAT98 KKCI 022210 - -HDS ^(JSAT98) (KKCI) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrncwf/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -# AWIPS1: POINT ^JU[BCFJMNOTVW]E(00|9[679]).*KKCI.* /aiv/sigwx/Raw -# JUWE96 KKCI 021800 -HDS ^(JU[BCFJMNOTVW]E(00|9[679])) KKCI (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrsigwx/(\3:yyyy)(\3:mm)\3/\4/\1_KKCI_\3\4\5_(seq).bufr.%Y%m%d%H - -## Hydro portion created during automation ## - -## Model Bufr Patterns ## -# From modelBufrAcq_patterns.template -# Localized if modelBufrClip.sup exists -- going to just add all for now - -# AWIPS1: POINT ^JUSA41.KWNO* /ispan/bufr/modelSoundings/NAM -# POINT ^JUSA41.KWBC* /ispan/bufr/modelSoundings/GFS -# JUSA42 KWNO 070200 -HDS ^(JUS[ABX]4[1-9]) (KW(NO|BC)) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/mdlsndg/(\4:yyyy)(\4:mm)\4/\5/\1_\2_\4\5\6_(seq).bufr.%Y%m%d%H - -## GOES Bufr Patterns ## -# From goesBufrAcq_patterns.template -# Localized if goesBufrClip.sup exists -- going to just add all for now - -# AWIPS1: POINT ^JUTX01.* /ispan/bufr/GOESSoundings -# -# JUTX05 KNES 070326 RRN -HDS ^(JUTX0[1-9]) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/goessndg/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -## POES Bufr Patterns ## -# From poesBufrAcq_patterns.template -# Localized if poesBufrClip.sup exists -- going to just add all for now - -# AWIPS1: POINT ^IUTX01.* /ispan/bufr/POESSoundings -# IUTX01 KNES 070307 -HDS ^(IUTX0[1-9]) (....) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/poessndg/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -## HDW Bufr Patterns ## -# From [east|west]HDWBufrAcq_patterns.template # -### From Automation ### - -# AWIPS1: POINT ^J[CGJMPR]CX[0-9]1.* /ispan/bufr/HDW -# AWIPS2 distribution file bufrhdw.xml: ^J[ACEGHJKMNPQR]CX[1-9]1.* -HDS ^(J[ACEGHJKMNPQR]CX[1-9]1) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrhdw/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -# AWIPS2 distribution file bufrssmi.xml: ^ISXA.* -HDS ^(ISXA..) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrssmi/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H - -# AWIPS2 distribution file bufrascat.xml: ^JSXX(0[1-9]|10).* -HDS ^(JSXX(0[1-9]|10)) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrascat/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).bufr.%Y%m%d%H - -# AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).* -HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/bufrmthdw/(\5:yyyy)(\5:mm)\5/\6/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H From 1a1895ac936fa3911190e5336fccf5474711f6b1 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 16 Oct 2012 12:52:30 -0500 Subject: [PATCH 3/5] Issue #1229 Changes for non-blocking ProcedureDlg. Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a Former-commit-id: b52f55d99cb525b1f8bd2765251afdf15307458b [formerly 185acb8d878df61b71ee77ff5aee24409f8195b5] [formerly 683c49fc4915a5c82ebad8ca0fa7881740e89a88] [formerly d9fee38d21c351794faf918898734426708d13dc [formerly 683c49fc4915a5c82ebad8ca0fa7881740e89a88 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]] Former-commit-id: d9fee38d21c351794faf918898734426708d13dc Former-commit-id: c9efa26bec3e542d6745350e252690672a230a79 [formerly f685ac224f09a44e83fb91fd06dbd1fb37c1c16c] Former-commit-id: 1572b423130433b669f3589e8ff45291734b5bc0 --- .../viz/d2d/ui/actions/AddAWIPSProcedure.java | 5 +- .../d2d/ui/actions/OpenAWIPSProcedure.java | 26 +++++----- .../ui/dialogs/procedures/ProcedureDlg.java | 47 +++++++++++-------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/AddAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/AddAWIPSProcedure.java index 056292b90f..25fe8a8032 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/AddAWIPSProcedure.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/AddAWIPSProcedure.java @@ -39,6 +39,7 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Sep 13, 2007 chammack Initial Creation. + * Oct 16, 2012 1229 rferrel Change to use ProcedureDlg.displayDialog. * * * @@ -57,10 +58,8 @@ public class AddAWIPSProcedure extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { Procedure procedure = new Procedure(); - ProcedureDlg dlg = ProcedureDlg.getOrCreateDialog(null, procedure, + ProcedureDlg.displayDialog(null, procedure, HandlerUtil.getActiveShell(event)); - dlg.open(); - return null; } diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java index 7e9d075b4b..6273747182 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java @@ -24,8 +24,6 @@ import java.io.File; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; import com.raytheon.uf.common.localization.LocalizationFile; @@ -33,7 +31,6 @@ import com.raytheon.uf.common.localization.LocalizationUtil; import com.raytheon.uf.viz.core.procedures.Procedure; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.OpenProcedureListDlg; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg; -import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureListDlg; import com.raytheon.viz.ui.VizWorkbenchManager; import com.raytheon.viz.ui.actions.LoadSerializedXml; @@ -47,6 +44,7 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Sep 13, 2007 chammack Initial Creation. + * Oct 16, 2012 1229 rferrel Change to use ProcedureDlg.displayDialog. * * * @@ -55,8 +53,8 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml; */ public class OpenAWIPSProcedure extends AbstractHandler { - private OpenProcedureListDlg dialog; - + private OpenProcedureListDlg dialog; + /* * (non-Javadoc) * @@ -66,25 +64,23 @@ public class OpenAWIPSProcedure extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - if(dialog != null){ - dialog.open(); - return null; - } - - dialog = new OpenProcedureListDlg( - HandlerUtil.getActiveShell(event)); + if (dialog != null) { + dialog.open(); + return null; + } + + dialog = new OpenProcedureListDlg(HandlerUtil.getActiveShell(event)); dialog.open(); - + LocalizationFile selectedFile = dialog.getSelectedFile(); dialog = null; if (selectedFile != null) { File f = selectedFile.getFile(); Procedure p = (Procedure) LoadSerializedXml.deserialize(f); - ProcedureDlg dlg = ProcedureDlg.getOrCreateDialog( + ProcedureDlg.displayDialog( LocalizationUtil.extractName(selectedFile.getName()), p, VizWorkbenchManager.getInstance().getCurrentWindow() .getShell()); - dlg.open(); } return null; diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java index 6323ab2da1..e54bb5d453 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java @@ -23,7 +23,7 @@ package com.raytheon.uf.viz.d2d.ui.dialogs.procedures; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; @@ -97,6 +97,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor; * ------------ ---------- ----------- -------------------------- * Initial Creation * Oct 16, 2012 1229 rferrel Changes for non-blocking AlterBundleDlg. + * Oct 16, 2012 1229 rferrel Changes to have displayDialog method. * * * @@ -114,7 +115,7 @@ public class ProcedureDlg extends CaveSWTDialog { public static final String PROCEDURES_DIR = "/procedures"; - private static Collection openDialogs = new ArrayList(); + private static final Map openDialogs = new HashMap(); private Font font; @@ -228,7 +229,7 @@ public class ProcedureDlg extends CaveSWTDialog { protected void disposed() { font.dispose(); synchronized (openDialogs) { - openDialogs.remove(this); + openDialogs.remove(fileName); } } @@ -927,6 +928,18 @@ public class ProcedureDlg extends CaveSWTDialog { return; } + ProcedureDlg oldDlg = getDialog(fn); + + if (oldDlg != null) { + oldDlg.close(); + } + + // Update mapping to new file name. + synchronized (openDialogs) { + openDialogs.remove(fileName); + openDialogs.put(fn, this); + } + frozen = dlg.isFrozen(); fileName = fn; saveProcedure(); @@ -1040,36 +1053,30 @@ public class ProcedureDlg extends CaveSWTDialog { * @return */ public static ProcedureDlg getDialog(String fileName) { - synchronized (openDialogs) { - if (fileName != null) { - for (ProcedureDlg dialog : openDialogs) { - if (fileName.equals(dialog.fileName)) { - return dialog; - } - } - } - return null; + synchronized (ProcedureDlg.openDialogs) { + ProcedureDlg dialog = openDialogs.get(fileName); + return dialog; } } /** - * Get the ProcedureDlg for the given fileName. If the fileName is null or - * if there is no open dialog, create a new ProcedureDlg. + * Get the ProcedureDlg for the given fileName and display it. * * @param fileName * @param p * @param parent - * @return */ - public static ProcedureDlg getOrCreateDialog(String fileName, Procedure p, - Shell parent) { + public static void displayDialog(String fileName, Procedure p, Shell parent) { synchronized (openDialogs) { ProcedureDlg dialog = getDialog(fileName); - if (dialog == null) { + if (dialog == null || dialog.getShell() == null + || dialog.isDisposed()) { dialog = new ProcedureDlg(fileName, p, parent); - openDialogs.add(dialog); + openDialogs.put(fileName, dialog); + dialog.open(); + } else { + dialog.bringToTop(); } - return dialog; } } } From d488733f3490646aab64a8a5e8f18db27652a351 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 16 Oct 2012 15:39:12 -0500 Subject: [PATCH 4/5] Issue #1229 Changes for non-blocking ProcedureListDlg. Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f Former-commit-id: 2a3905d0367dc0a52634d9394e8397eb463a2151 [formerly 1dc188fb3b3c653bbaf363537b97306e78d5d518] [formerly 1a1f1a060124b9f26ceff660e07c3f101006c047] [formerly d51ba247d15492da10912bea080f56499024b718 [formerly 1a1f1a060124b9f26ceff660e07c3f101006c047 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]] Former-commit-id: d51ba247d15492da10912bea080f56499024b718 Former-commit-id: a72f8583c7b5401510e3347f30a766d38722275a [formerly 85f8c1f282b8425ec475e9617fd581bb5fd1fe9b] Former-commit-id: 3682a16ad21761220420d78a7f28039b2ff55b01 --- .../d2d/ui/actions/DeleteAWIPSProcedure.java | 44 +++++++++++---- .../d2d/ui/actions/OpenAWIPSProcedure.java | 39 +++++++------ .../ui/dialogs/procedures/ProcedureDlg.java | 55 +++++++++++-------- .../dialogs/procedures/ProcedureListDlg.java | 41 +++++++------- 4 files changed, 108 insertions(+), 71 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java index 70c6d1740e..8a74e8eb90 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java @@ -25,8 +25,13 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.handlers.HandlerUtil; import com.raytheon.uf.common.localization.LocalizationFile; +import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException; +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.viz.d2d.ui.dialogs.procedures.ProcedureListDlg; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureListDlg.Mode; +import com.raytheon.viz.ui.dialogs.ICloseCallback; /** * DeleteAWIPSProcedure @@ -41,6 +46,7 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureListDlg.Mode; * ------------ ---------- ----------- -------------------------- * Sep 13, 2007 chammack Initial Creation. * Jul 8, 2008 #1183 chammack Migrate to new localization + * Oct 16, 2012 #1229 rferrel Changes for non-blocking ProcedureListDlg. * * * @@ -48,6 +54,10 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureListDlg.Mode; * @version 1 */ public class DeleteAWIPSProcedure extends AbstractHandler { + private final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(DeleteAWIPSProcedure.class); + + private ProcedureListDlg listDlg; /* * (non-Javadoc) @@ -58,18 +68,30 @@ public class DeleteAWIPSProcedure extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - ProcedureListDlg listDlg = new ProcedureListDlg("Delete Procedure", - HandlerUtil.getActiveShell(event), Mode.DELETE); - listDlg.open(); + if (listDlg == null || listDlg.getShell() == null + || listDlg.isDisposed()) { + listDlg = new ProcedureListDlg("Delete Procedure", + HandlerUtil.getActiveShell(event), Mode.DELETE); + listDlg.setCloseCallback(new ICloseCallback() { - LocalizationFile selectedFile = listDlg.getSelectedFile(); - if (selectedFile != null && selectedFile.exists()) { - try { - selectedFile.delete(); - } catch (Exception e) { - throw new ExecutionException("Error deleting procedure: " - + selectedFile.getName(), e); - } + @Override + public void dialogClosed(Object returnValue) { + if (returnValue instanceof LocalizationFile) { + LocalizationFile selectedFile = (LocalizationFile) returnValue; + try { + selectedFile.delete(); + } catch (LocalizationOpFailedException e) { + statusHandler.handle( + Priority.PROBLEM, + "Error deleting procedure: " + + selectedFile.getName()); + } + } + } + }); + listDlg.open(); + } else { + listDlg.bringToTop(); } return null; diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java index 6273747182..306883f180 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java @@ -33,6 +33,7 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.OpenProcedureListDlg; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg; import com.raytheon.viz.ui.VizWorkbenchManager; import com.raytheon.viz.ui.actions.LoadSerializedXml; +import com.raytheon.viz.ui.dialogs.ICloseCallback; /** * OpenAWIPSProcedure @@ -45,6 +46,7 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml; * ------------ ---------- ----------- -------------------------- * Sep 13, 2007 chammack Initial Creation. * Oct 16, 2012 1229 rferrel Change to use ProcedureDlg.displayDialog. + * Oct 16, 2012 1229 rferrel Changes for non-blocking ProcedureListDlg. * * * @@ -64,23 +66,28 @@ public class OpenAWIPSProcedure extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - if (dialog != null) { + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { + dialog = new OpenProcedureListDlg(HandlerUtil.getActiveShell(event)); + dialog.setCloseCallback(new ICloseCallback() { + + @Override + public void dialogClosed(Object returnValue) { + if (returnValue instanceof LocalizationFile) { + LocalizationFile selectedFile = (LocalizationFile) returnValue; + File f = selectedFile.getFile(); + Procedure p = (Procedure) LoadSerializedXml + .deserialize(f); + ProcedureDlg.displayDialog(LocalizationUtil + .extractName(selectedFile.getName()), p, + VizWorkbenchManager.getInstance() + .getCurrentWindow().getShell()); + } + dialog = null; + } + }); dialog.open(); - return null; - } - - dialog = new OpenProcedureListDlg(HandlerUtil.getActiveShell(event)); - dialog.open(); - - LocalizationFile selectedFile = dialog.getSelectedFile(); - dialog = null; - if (selectedFile != null) { - File f = selectedFile.getFile(); - Procedure p = (Procedure) LoadSerializedXml.deserialize(f); - ProcedureDlg.displayDialog( - LocalizationUtil.extractName(selectedFile.getName()), p, - VizWorkbenchManager.getInstance().getCurrentWindow() - .getShell()); + } else { + dialog.bringToTop(); } return null; diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java index e54bb5d453..dee0cec572 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java @@ -98,6 +98,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor; * Initial Creation * Oct 16, 2012 1229 rferrel Changes for non-blocking AlterBundleDlg. * Oct 16, 2012 1229 rferrel Changes to have displayDialog method. + * Oct 16, 2012 1229 rferrel Changes for non-blocking ProcedureListDlg. * * * @@ -173,6 +174,8 @@ public class ProcedureDlg extends CaveSWTDialog { private AlterBundleDlg alterDlg; + private ProcedureListDlg saveAsDlg; + private ProcedureDlg(String fileName, Procedure p, Shell parent) { // Win32 super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.INDEPENDENT_SHELL @@ -919,30 +922,38 @@ public class ProcedureDlg extends CaveSWTDialog { } private void showSaveAsDlg() { - ProcedureListDlg dlg = new ProcedureListDlg("Save Procedure As...", - shell, ProcedureListDlg.Mode.SAVE); - dlg.open(); + if (mustCreate(saveAsDlg)) { + saveAsDlg = new ProcedureListDlg("Save Procedure As...", shell, + ProcedureListDlg.Mode.SAVE); - String fn = dlg.getSelectedFileName(); - if (fn == null) { - return; + saveAsDlg.setCloseCallback(new ICloseCallback() { + + @Override + public void dialogClosed(Object returnValue) { + String fn = saveAsDlg.getSelectedFileName(); + if (fn != null) { + ProcedureDlg oldDlg = getDialog(fn); + + if (oldDlg != null) { + oldDlg.close(); + } + + // Update mapping to new file name. + synchronized (openDialogs) { + openDialogs.remove(fileName); + openDialogs.put(fn, ProcedureDlg.this); + } + + frozen = saveAsDlg.isFrozen(); + fileName = fn; + saveProcedure(); + } + } + }); + saveAsDlg.open(); + } else { + saveAsDlg.bringToTop(); } - - ProcedureDlg oldDlg = getDialog(fn); - - if (oldDlg != null) { - oldDlg.close(); - } - - // Update mapping to new file name. - synchronized (openDialogs) { - openDialogs.remove(fileName); - openDialogs.put(fn, this); - } - - frozen = dlg.isFrozen(); - fileName = fn; - saveProcedure(); } /** diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureListDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureListDlg.java index baea4279c1..51411554db 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureListDlg.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureListDlg.java @@ -56,19 +56,21 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; /** * - * A dialog which displays a list of procedures for opening, saving, or deleting. + * A dialog which displays a list of procedures for opening, saving, or + * deleting. * * 
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * ???                                 Initial creation
  * 07/31/2012   DR 15036   D. Friedman Ensure current user's procedures
  *                                     are visible.
+ * 10/16/2012   1229       rferrel     Made dialog non-blocking.
  *
- * + * * @author unknown * @version 1.0 */ @@ -80,8 +82,6 @@ public class ProcedureListDlg extends CaveSWTDialog { private Text procedureTF; - private LocalizationFile selectedFile; - private TreeViewer treeViewer; private Button okBtn; @@ -103,7 +103,7 @@ public class ProcedureListDlg extends CaveSWTDialog { private final Mode mode; public ProcedureListDlg(String title, Shell parent, Mode mode) { - super(parent, SWT.DIALOG_TRIM | SWT.RESIZE); // Win32 + super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK); // Win32 setText(title); this.mode = mode; @@ -343,7 +343,8 @@ public class ProcedureListDlg extends CaveSWTDialog { public void run() { TreeItem[] items = treeViewer.getTree().getItems(); if (items != null && items.length > 0) - treeViewer.getTree().showItem(items[items.length - 1]); + treeViewer.getTree().showItem( + items[items.length - 1]); treeViewer.reveal(find); } }); @@ -401,7 +402,7 @@ public class ProcedureListDlg extends CaveSWTDialog { cancelBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { - shell.dispose(); + close(); } }); @@ -420,13 +421,6 @@ public class ProcedureListDlg extends CaveSWTDialog { } } - /** - * @return the fileName - */ - public LocalizationFile getSelectedFile() { - return selectedFile; - } - /** * @return the fileName */ @@ -492,21 +486,22 @@ public class ProcedureListDlg extends CaveSWTDialog { + " already exists. Overwrite anyways?"); if (result == true) { fileName = procedureTF.getText(); - shell.dispose(); + close(); } } } else { fileName = procedureTF.getText(); - shell.dispose(); + close(); } } else if (mode == Mode.OPEN) { fileName = procedureTF.getText(); if (tmp instanceof ProcedureTree) { // it must be a procedure tree, that is what the content // provider uses internally - selectedFile = ((ProcedureTree) tmp).getFile(); + LocalizationFile selectedFile = ((ProcedureTree) tmp).getFile(); + setReturnValue(selectedFile); } - shell.dispose(); + close(); } else if (mode == Mode.DELETE) { TreeItem[] selection = treeViewer.getTree().getSelection(); @@ -520,9 +515,11 @@ public class ProcedureListDlg extends CaveSWTDialog { if (tmp instanceof ProcedureTree) { // it must be a procedure tree, that is what the content // provider uses internally - selectedFile = ((ProcedureTree) tmp).getFile(); + LocalizationFile selectedFile = ((ProcedureTree) tmp) + .getFile(); + setReturnValue(selectedFile); } - shell.dispose(); + close(); } } } From 47fa3c0255bdf6e73d82d71e889ce75624fb0d96 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 16 Oct 2012 17:00:11 -0500 Subject: [PATCH 5/5] Issue #1229 Changes for non-blocking BackgroundColorDialog. Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9 Former-commit-id: 947b8762e85e606a90fb88a61ebc2900e4f850fd [formerly ac301433350fd0b49bbdd182f617b5b125e0f759] [formerly 057f350d4752f372e69f416f727706cdfbadd9f5 [formerly 59a2dd6a3a0495496ae1aebf016b5318ac36c5dd]] [formerly d60b4ca39602c7789f44413b517ad7123e1392c3 [formerly 59a2dd6a3a0495496ae1aebf016b5318ac36c5dd [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]] Former-commit-id: d60b4ca39602c7789f44413b517ad7123e1392c3 Former-commit-id: 20ecbdaaa964dc53cac032342d78e7104ac0ed46 [formerly 757affcc663c2bcfd3566e611c1c3c3bf97484da] Former-commit-id: f253f2191b168938fef4e780ccb9241e8a32ba36 --- .../d2d/ui/map/actions/SetBackgroundColorAction.java | 12 ++++++++++-- .../raytheon/viz/ui/actions/SetBackgroundColor.java | 4 ++-- .../dialogs/colordialog/BackgroundColorDialog.java | 4 +++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/SetBackgroundColorAction.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/SetBackgroundColorAction.java index 13c53b91b9..ae0bc37405 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/SetBackgroundColorAction.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/SetBackgroundColorAction.java @@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Display; import com.raytheon.uf.viz.core.IDisplayPaneContainer; import com.raytheon.viz.ui.cmenu.AbstractRightClickAction; import com.raytheon.viz.ui.color.IBackgroundColorChangedListener.BGColorMode; +import com.raytheon.viz.ui.dialogs.ICloseCallback; import com.raytheon.viz.ui.dialogs.colordialog.BackgroundColorDialog; /** @@ -38,6 +39,7 @@ import com.raytheon.viz.ui.dialogs.colordialog.BackgroundColorDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Sep 1, 2009 mschenke Initial creation + * Oct 16, 2012 1229 rferrel Changes for non-blocking BackgroundColorDialog. * * * @@ -67,12 +69,18 @@ public class SetBackgroundColorAction extends AbstractRightClickAction { @Override public void run() { BackgroundColorDialog dialog = dialogMap.get(container); - if (dialog == null) { + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { dialog = new BackgroundColorDialog(Display.getCurrent() .getActiveShell(), container, mode); dialogMap.put(container, dialog); + dialog.setCloseCallback(new ICloseCallback() { + + @Override + public void dialogClosed(Object returnValue) { + dialogMap.remove(container); + } + }); dialog.open(); - dialogMap.remove(container); } else { dialog.bringToTop(); } diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/SetBackgroundColor.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/SetBackgroundColor.java index 081f930b8d..dce59577a0 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/SetBackgroundColor.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/SetBackgroundColor.java @@ -38,6 +38,7 @@ import com.raytheon.viz.ui.dialogs.colordialog.BackgroundColorDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 7,2008 Dan Fitch Initial Creation + * Oct 16, 2012 1229 rferrel Changed for non-blocking BackgroundColorDialog. * * * @@ -50,11 +51,10 @@ public class SetBackgroundColor extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { - if (dialog == null) { + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { dialog = new BackgroundColorDialog( HandlerUtil.getActiveShell(event), null, BGColorMode.GLOBAL); dialog.open(); - dialog = null; } else { dialog.bringToTop(); } diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/BackgroundColorDialog.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/BackgroundColorDialog.java index ed10298aba..fc2b9850c6 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/BackgroundColorDialog.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/BackgroundColorDialog.java @@ -48,6 +48,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 1/8/2008 706 Dan Fitch Initial Creation. + * 10/16/2012 1229 rferrel Make dialog non-blocking. * * * @@ -108,7 +109,8 @@ public class BackgroundColorDialog extends CaveSWTDialog implements */ public BackgroundColorDialog(Shell parent, IDisplayPaneContainer container, BGColorMode mode) { - super(parent, SWT.DIALOG_TRIM | SWT.MIN, CAVE.PERSPECTIVE_INDEPENDENT); + super(parent, SWT.DIALOG_TRIM | SWT.MIN, CAVE.PERSPECTIVE_INDEPENDENT + | CAVE.DO_NOT_BLOCK); setText("Set Background Color"); this.container = container; this.mode = mode;