diff --git a/rpms/awips2.upc/Installer.ldm/component.spec b/rpms/awips2.upc/Installer.ldm/component.spec index 561d2aa662..cb319da605 100644 --- a/rpms/awips2.upc/Installer.ldm/component.spec +++ b/rpms/awips2.upc/Installer.ldm/component.spec @@ -1,4 +1,4 @@ -%define _ldm_version 6.12.14 +%define _ldm_version 6.13.3 %define _ldm_src_tar ldm-%{_ldm_version}.tar.gz # ldm-%{_ldm_version}.tar.gz is tarred up ldm-%{_ldm_version}/src dir after # ISG makes retrans changes diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf index 5d944ec0f4..f03c5a57ce 100644 --- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf +++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf @@ -9,7 +9,7 @@ LIGHTNING LIGHTNING # FILE -overwrite -edex -close /awips2/data_store/nldn/\1_\3_\4\5\6_(seq).nldn.%Y%m%d%H # Earth Networks Total Lightning #NGRID ^(SFPA42) ([A-Z]{4}) (..)(..)(..) -# FILE -overwrite -edex -close /awips2/data_store/entlightning/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +# FILE -overwrite -edex -close /awips2/data_store/entlightning/\1_\2_\3\4\5_(seq).%Y%m%d%H # NPP/VIIRS NOTHER ^(TIP...) (KNES) (......) FILE -close -edex @@ -20,80 +20,80 @@ NOTHER ^(TIP...) (KNES) (......) #DDPLUS|IDS ^([A-Z][A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..) # FILE -overwrite -close -edex /awips2/data_store/TEXT/\3_\4_\1_\2_\3\4\5_(seq).%Y%m%d%h IDS|DDPLUS ^(M[A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\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 -close -edex /awips2/data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(SE[A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(WE[CHP][A-Z][0-9]{2}) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(A[AC-FH-RT-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/summaries/\1_\2_\3\4\5_(seq).%Y%m%d%H ANY ^(AG..[0-9][0-9]) (KWB.) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/summaries/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(B.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/fire_wx_spot_fcst_reports/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/fire_wx_spot_fcst_reports/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(C.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/climate/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/climate/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(F[A-FH-NP-Z]..[0-9][0-9]) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/forecast/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(FOUS[1-589].) (....) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/forecast/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/forecast/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(FONT1[0-9]) KNHC (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/text/(\2:yyyy)(\2:mm)\2/\3/\1_KNHC_\2\3\4_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\1_KNHC_\2\3\4_(seq).%Y%m%d%H IDS|DDPLUS ^(N[A-VYZ]....) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(NWUS[01346-9].) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(NWUS5.) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/lsr/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/lsr/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(NWUS2.) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/svrwx/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/svrwx/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(NXUS[0-57-9].) (....) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/misc_adm_messages/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(R.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/xml/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/xml/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(SM[UCM][SNX]..) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/synoptic/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/synoptic/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(SHUS..) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/misc_sfc_obs/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/misc_sfc_obs/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(S[AP].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/metar/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/metar/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(S[MIN]V[DCE]..|SSV[DX]..) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/maritime/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/maritime/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(SXUS2[0123]) KWNB (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/maritime/(\2:yyyy)(\2:mm)\2/\3/\1_KWNB_\2\3\4_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/maritime/\1_KWNB_\2\3\4_(seq).%Y%m%d%H IDS|DDPLUS ^(SXUS..) (.{4}) (..)(..)(..) /pRER - FILE -overwrite -close -edex /awips2/data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/text/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(UA(US|PA|NT)..) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/airep/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/airep/\1_\3_\4\5\6_(seq).%Y%m%d%H IDS|DDPLUS ^(UB.{4}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/pirep/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/pirep/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(U[SM].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/raobs/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/raobs/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(U[^ABSM].{4}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/upperair/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/upperair/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(V.{5}) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/MAROB/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/MAROB/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(W[BD-RTUW-Z]....) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/wwa/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/wwa/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(WSUS3[123]) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/convsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/convsigmet/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(W[CSV]US0[1-6]) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/nonconvsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/nonconvsigmet/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(WAUS4[1-6]) (.{4}) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/airmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/airmet/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(W[CSV]PA((0[1-9])|(1[1-3]))) (PHFO) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\1_\5_\6\7\8_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/intlsigmet/\1_\5_\6\7\8_(seq).%Y%m%d%H IDS|DDPLUS ^(W[CSV]NT((0[1-9])|(1[1-3]))) (KKCI) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/intlsigmet/(\6:yyyy)(\6:mm)\6/\7/\1_\5_\6\7\8_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/intlsigmet/\1_\5_\6\7\8_(seq).%Y%m%d%H IDS|DDPLUS ^(WAAK4[789]) (PAWU) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/intlsigmet/\1_\2_\3\4\5_(seq).%Y%m%d%H IDS|DDPLUS ^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/intlsigmet/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/intlsigmet/\1_\2_\3\4\5_(seq).%Y%m%d%H # Redbook graphics ANY ^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8}) - FILE -overwrite -close -edex /awips2/data_store/redbook/(\3:yyyy)(\3:mm)\3/\4/\8/\4\5Z_\8_\7_\6-\1_\2_(seq).rb.%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/redbook/\8/\4\5Z_\8_\7_\6-\1_\2_(seq).rb.%Y%m%d%H # IUAK01 PANC 012300 # IUPT01 KBOU 020300 HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) @@ -102,7 +102,7 @@ HDS ^(IUPT0[1-4]|IUPT40|IUAK01) (.{4}) (..)(..)(..) ## NOAAPORT GINI images ## NIMAGE ^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/sat/(\(10):yyyy)(\(10):mm)\(10)/\(11)/\2/\(11)\(12)Z_\3_\7_\6-\8_\9_(seq).satz.%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9_(seq).satz.%Y%m%d%H ## ## NEXRAD3 GEMPAK-generated national composite (1-4km) @@ -131,10 +131,10 @@ NEXRAD3 ^SDUS[23578]. .... (......) /p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N # IUAX02 KARP 022359 ANY ^(IUAX0[12]) (....) (..)(..)(..) FILE -overwrite -log -close - /awips2/data_store/acars/acars_encrypted/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).acars.%Y%m%d%H + /awips2/data_store/acars/acars_encrypted/\1_\2_\3\4\5_(seq).acars.%Y%m%d%H ANY ^(IUAX0[12]) (....) (..)(..)(..) PIPE -close /awips2/ldm/decoders/decrypt_file - /awips2/data_store/acars/acars_decrypted/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).acars.%Y%m%d%H + /awips2/data_store/acars/acars_decrypted/\1_\2_\3\4\5_(seq).acars.%Y%m%d%H EXP ^/awips2/data_store/acars/acars_decrypted/(.*) FILE -overwrite -log -close -edex /awips2/data_store/acars/acars_decrypted/\1 @@ -142,7 +142,7 @@ EXP ^/awips2/data_store/acars/acars_decrypted/(.*) # IUAK are Alaskan profilers and IUAX has encrypted ACARS handled above! ANY ^(IUA[^XK]0[12]) (....) (..)(..)(..) FILE -overwrite -close -edex - /awips2/data_store/acars/acars_raw_decrypted/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + /awips2/data_store/acars/acars_raw_decrypted/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # modelSoundings HDS ^(JUS[ABX]4[1-9]) (KW(NO|BC)) (..)(..)(..) FILE -overwrite -close -edex /awips2/data_store/modelsounding/\1_\2_\4\5\6_(seq).bufr.%Y%m%d%H @@ -151,7 +151,7 @@ HDS ^(JUTX0[1-9]) (....) (..)(..)(..) FILE -overwrite -close -edex /awips2/data_store/goessounding/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # NUCAPS HDS ^(IUTN0[1-5]) (....) (..)(..)(..) - FILE -overwrite -close -edex /awips2/data_store/nucaps/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H + FILE -overwrite -close -edex /awips2/data_store/nucaps/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H # POES soundings HDS ^(IUTX0[1-9]) (....) (..)(..)(..) FILE -overwrite -close -edex /awips2/data_store/poessounding/\1_\2_\3\4\5_(seq).bufr.%Y%m%d%H diff --git a/rpms/awips2.upc/Installer.ldm/src/ldm-6.12.14.tar.gz b/rpms/awips2.upc/Installer.ldm/src/ldm-6.12.14.tar.gz deleted file mode 100644 index 95dab0227e..0000000000 Binary files a/rpms/awips2.upc/Installer.ldm/src/ldm-6.12.14.tar.gz and /dev/null differ diff --git a/rpms/awips2.upc/Installer.ldm/src/ldm-6.13.3.tar.gz b/rpms/awips2.upc/Installer.ldm/src/ldm-6.13.3.tar.gz new file mode 100644 index 0000000000..6b6d87d6fb Binary files /dev/null and b/rpms/awips2.upc/Installer.ldm/src/ldm-6.13.3.tar.gz differ