From 8ceafa62d4ef526bc039cb2ad78571b9b149cdb2 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 21 May 2021 20:46:56 -0600
Subject: [PATCH 1/2] Improve operation of the DAP4 code and fix bugs

re: e-support EOT-483791

* Add a new set of remote tests based on using the thredds-test server.
* Improve error reporting when server requests fail.
* Fix handing of _NCProperties attribute
---
 .github/workflows/run_tests.yml               |   2 +-
 dap4_test/CMakeLists.txt                      |   2 +
 dap4_test/Makefile.am                         |   9 +-
 dap4_test/baselinethredds/CMakeLists.txt      |  13 +
 ...21_020218_0.47_1km_33.3N_91.4W.nc4.thredds | 458 ++++++++++++++++++
 dap4_test/d4test_common.sh                    |  19 +-
 dap4_test/test_common.h                       |   3 +-
 dap4_test/test_hyrax.sh                       |  11 +-
 dap4_test/test_thredds.sh                     |  49 ++
 libdap4/d4chunk.c                             |  56 ++-
 libdap4/d4file.c                              |   8 +-
 libdap4/d4http.c                              |  33 +-
 libdap4/d4meta.c                              |  11 +-
 libdap4/d4read.c                              |  21 +-
 libdap4/d4util.c                              |  10 +
 libdap4/d4varx.c                              |   4 +-
 libdap4/ncd4.h                                |   7 +-
 libdap4/ncd4dispatch.c                        |   2 +
 libdap4/ncd4types.h                           |   1 +
 libdispatch/dinfermodel.c                     |   2 +-
 nc_test4/tst_camrun.c                         |   2 +-
 21 files changed, 653 insertions(+), 70 deletions(-)
 create mode 100644 dap4_test/baselinethredds/CMakeLists.txt
 create mode 100644 dap4_test/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
 create mode 100755 dap4_test/test_thredds.sh

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index d361773220..91434c896a 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -4,7 +4,7 @@
 
 name: Run netCDF Tests
 
-on: [pull_request]
+on: [pull_request,push]
 
 jobs:
 
diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
index a222a8121e..3c9c97bc29 100644
--- a/dap4_test/CMakeLists.txt
+++ b/dap4_test/CMakeLists.txt
@@ -13,6 +13,7 @@ ADD_SUBDIRECTORY(baseline)
 ADD_SUBDIRECTORY(baselineraw)
 ADD_SUBDIRECTORY(baselineremote)
 ADD_SUBDIRECTORY(baselinehyrax)
+ADD_SUBDIRECTORY(baselinethredds)
 ADD_SUBDIRECTORY(cdltestfiles)
 ADD_SUBDIRECTORY(daptestfiles)
 ADD_SUBDIRECTORY(dmrtestfiles)
@@ -55,6 +56,7 @@ IF(ENABLE_TESTS)
 
   IF(ENABLE_DAP_REMOTE_TESTS)
       add_sh_test(dap4_test test_hyrax)
+      add_sh_test(dap4_test test_thredds)
   ENDIF(ENABLE_DAP_REMOTE_TESTS)
 
 ENDIF(ENABLE_TESTS)
diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
index efc14d6753..910783e645 100644
--- a/dap4_test/Makefile.am
+++ b/dap4_test/Makefile.am
@@ -42,7 +42,7 @@ pingurl4_SOURCES = pingurl4.c
 if ENABLE_DAP_REMOTE_TESTS
 if BUILD_UTILITIES
   # relies on ncdump
-  TESTS += test_hyrax.sh
+  TESTS += test_hyrax.sh test_thredds.sh
 if AX_IGNORE
   TESTS += test_remote.sh
 endif
@@ -50,10 +50,10 @@ endif
 endif
 
 EXTRA_DIST = test_parse.sh test_meta.sh test_data.sh \
-             test_raw.sh test_remote.sh test_hyrax.sh test_fillmismatch.sh \
+             test_raw.sh test_remote.sh test_hyrax.sh test_thredds.sh test_fillmismatch.sh \
              tst_curlopt.sh d4test_common.sh \
 	     daptestfiles dmrtestfiles cdltestfiles nctestfiles misctestfiles \
-	     baseline baselineraw baselineremote baselinehyrax CMakeLists.txt test_common.h
+	     baseline baselineraw baselineremote baselinehyrax baselinethredds CMakeLists.txt test_common.h
 
 CLEANFILES = *.exe
 # This should only be left behind if using parallel io
@@ -72,8 +72,7 @@ clean-local: clean-local-check
 .PHONY: clean-local-check
 
 clean-local-check:
-	-rm -rf results results_test_parse results_test_data \
-                results_test_hyrax results_test_meta results_test_raw
+	-rm -rf results results_test_*
 	-rm -f .dodsrc .daprc
 
 # The shell file maketests.sh is used to build the testdata
diff --git a/dap4_test/baselinethredds/CMakeLists.txt b/dap4_test/baselinethredds/CMakeLists.txt
new file mode 100644
index 0000000000..85d40c3a9b
--- /dev/null
+++ b/dap4_test/baselinethredds/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt)
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/dap4_test/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds b/dap4_test/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
new file mode 100644
index 0000000000..3346b3bd8a
--- /dev/null
+++ b/dap4_test/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
@@ -0,0 +1,458 @@
+netcdf GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W {
+dimensions:
+	y = 5120 ;
+variables:
+	short y(y) ;
+		string y:standard_name = "projection_y_coordinate" ;
+		string y:units = "meters" ;
+		y:add_offset = 3530198.70170504 ;
+		y:scale_factor = -1015.88124999963 ;
+
+// global attributes:
+		:satellite_altitude = 35785831. ;
+		string :Conventions = "CF-1.6" ;
+		string :satellite_id = "GOES-16" ;
+		:source_spatial_resolution = 1.f ;
+		string :title = "Sectorized Cloud and Moisture Imagery for the TCONUSM3 region." ;
+		:product_tile_height = 1024 ;
+		:product_rows = 5120 ;
+		:abi_mode = 3 ;
+		:product_center_latitude = 33.294 ;
+		:product_center_longitude = -91.406 ;
+		:pixel_x_size = 1.01588125 ;
+		string :projection = "Lambert Conformal" ;
+		:product_columns = 6144 ;
+		:product_tile_width = 1024 ;
+		:satellite_latitude = 0. ;
+		string :ICD_version = "GROUND SEGMENT (GS) TO ADVANCED WEATHER INTERACTIVE PROCESSING SYSTEM (AWIPS) INTERFACE CONTROL DOCUMENT (ICD) Revision B" ;
+		string :source_scene = "CONUS" ;
+		string :production_location = "WCDAS" ;
+		:request_spatial_resolution = 1.015881f ;
+		:central_wavelength = 0.4699998f ;
+		:pixel_y_size = 1.01588125 ;
+		string :product_name = "TCONUS-010-B12-M3C01" ;
+		string :created_by = "ldm-alchemy" ;
+		:satellite_longitude = -89.5 ;
+		string :_dap4.ce = "/y[0:5119]" ;
+		:periodicity = 5.000001f ;
+		:product_tiles_received = 30LL ;
+		:bit_depth = 12 ;
+		string :start_date_time = "2017233020218" ;
+		:number_product_tiles = 30 ;
+		:channel_id = 1 ;
+data:
+
+ y = 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 
+    38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 
+    56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
+    74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 
+    92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 
+    108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 
+    122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 
+    136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 
+    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 
+    164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 
+    178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 
+    192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 
+    206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 
+    220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 
+    234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 
+    248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 
+    262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 
+    276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 
+    290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 
+    304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 
+    318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 
+    332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 
+    346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 
+    360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 
+    374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 
+    388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 
+    402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 
+    416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 
+    430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 
+    444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 
+    458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 
+    472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 
+    486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 
+    500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 
+    514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 
+    528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 
+    542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 
+    556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 
+    570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 
+    584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 
+    598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 
+    612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 
+    626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 
+    640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 
+    654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 
+    668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 
+    682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 
+    696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 
+    710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 
+    724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 
+    738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 
+    752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 
+    766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 
+    780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 
+    794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 
+    808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 
+    822, 823, 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 
+    836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 
+    850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 
+    864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 
+    878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 
+    892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 
+    906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, 
+    920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 
+    934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 
+    948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 
+    962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, 
+    976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 
+    990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 
+    1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 
+    1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 
+    1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 
+    1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 
+    1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 
+    1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 
+    1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 
+    1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 
+    1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 
+    1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 
+    1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1135, 
+    1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 
+    1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 
+    1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 
+    1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 
+    1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 
+    1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 
+    1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 
+    1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 
+    1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 
+    1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 
+    1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 
+    1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 
+    1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 
+    1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 
+    1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, 
+    1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 
+    1328, 1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 
+    1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 
+    1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 
+    1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375, 
+    1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 
+    1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, 
+    1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 
+    1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, 
+    1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, 1435, 
+    1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1447, 
+    1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 
+    1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 
+    1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, 1482, 1483, 
+    1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 
+    1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 
+    1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, 
+    1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531, 
+    1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, 
+    1544, 1545, 1546, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, 1555, 
+    1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 
+    1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 
+    1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 
+    1592, 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 
+    1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 
+    1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626, 1627, 
+    1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638, 1639, 
+    1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, 1650, 1651, 
+    1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, 1663, 
+    1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 
+    1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, 1687, 
+    1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699, 
+    1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, 1711, 
+    1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1722, 1723, 
+    1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1735, 
+    1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, 1747, 
+    1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759, 
+    1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770, 1771, 
+    1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 
+    1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 
+    1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, 1807, 
+    1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, 1819, 
+    1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, 1830, 1831, 
+    1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, 1843, 
+    1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 
+    1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866, 1867, 
+    1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, 1878, 1879, 
+    1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, 1891, 
+    1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, 1903, 
+    1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915, 
+    1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, 1927, 
+    1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938, 1939, 
+    1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951, 
+    1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1962, 1963, 
+    1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975, 
+    1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 
+    1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 
+    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 
+    2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 
+    2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 
+    2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047, 
+    2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 
+    2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 
+    2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 
+    2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 
+    2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 
+    2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 
+    2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 
+    2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 
+    2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 
+    2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167, 
+    2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 
+    2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 
+    2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, 2203, 
+    2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 
+    2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 
+    2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, 
+    2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251, 
+    2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, 2263, 
+    2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 
+    2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, 
+    2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299, 
+    2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 
+    2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 
+    2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, 2335, 
+    2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2347, 
+    2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, 2359, 
+    2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 
+    2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, 2383, 
+    2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, 2395, 
+    2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 
+    2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, 2419, 
+    2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, 2431, 
+    2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, 2443, 
+    2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, 2455, 
+    2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 
+    2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, 2479, 
+    2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 
+    2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, 2503, 
+    2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, 
+    2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, 2527, 
+    2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 
+    2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, 2551, 
+    2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 
+    2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, 2575, 
+    2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, 
+    2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, 
+    2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611, 
+    2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, 2623, 
+    2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, 2634, 2635, 
+    2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 
+    2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, 2658, 2659, 
+    2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2670, 2671, 
+    2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, 2683, 
+    2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, 2694, 2695, 
+    2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, 2706, 2707, 
+    2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, 2718, 2719, 
+    2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, 2730, 2731, 
+    2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, 2742, 2743, 
+    2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, 2755, 
+    2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, 2766, 2767, 
+    2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778, 2779, 
+    2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, 2790, 2791, 
+    2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, 2803, 
+    2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, 2814, 2815, 
+    2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826, 2827, 
+    2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, 2838, 2839, 
+    2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850, 2851, 
+    2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, 2862, 2863, 
+    2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874, 2875, 
+    2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, 2886, 2887, 
+    2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, 2899, 
+    2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, 2910, 2911, 
+    2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922, 2923, 
+    2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, 2934, 2935, 
+    2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, 2947, 
+    2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2958, 2959, 
+    2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 
+    2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, 2982, 2983, 
+    2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, 2994, 2995, 
+    2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 
+    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 
+    3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031, 
+    3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, 
+    3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 
+    3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, 3067, 
+    3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, 3079, 
+    3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3091, 
+    3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, 3103, 
+    3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, 3115, 
+    3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127, 
+    3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138, 3139, 
+    3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, 3150, 3151, 
+    3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, 3163, 
+    3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, 3175, 
+    3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, 3187, 
+    3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, 3198, 3199, 
+    3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, 3211, 
+    3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, 3223, 
+    3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, 3235, 
+    3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, 3247, 
+    3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, 3259, 
+    3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 
+    3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, 3282, 3283, 
+    3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 
+    3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, 3306, 3307, 
+    3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, 3318, 3319, 
+    3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, 3331, 
+    3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, 3342, 3343, 
+    3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355, 
+    3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, 3366, 3367, 
+    3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379, 
+    3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391, 
+    3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, 3402, 3403, 
+    3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, 3414, 3415, 
+    3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427, 
+    3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, 3438, 3439, 
+    3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, 3451, 
+    3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, 3462, 3463, 
+    3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, 3475, 
+    3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3486, 3487, 
+    3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, 3499, 
+    3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, 3510, 3511, 
+    3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, 3523, 
+    3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, 3534, 3535, 
+    3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546, 3547, 
+    3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, 3558, 3559, 
+    3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570, 3571, 
+    3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, 3582, 3583, 
+    3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 
+    3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 
+    3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 3619, 
+    3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, 3631, 
+    3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 3643, 
+    3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 
+    3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, 3667, 
+    3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, 3678, 3679, 
+    3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 3691, 
+    3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700, 3701, 3702, 3703, 
+    3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714, 3715, 
+    3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724, 3725, 3726, 3727, 
+    3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738, 3739, 
+    3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, 3750, 3751, 
+    3752, 3753, 3754, 3755, 3756, 3757, 3758, 3759, 3760, 3761, 3762, 3763, 
+    3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, 3775, 
+    3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, 3787, 
+    3788, 3789, 3790, 3791, 3792, 3793, 3794, 3795, 3796, 3797, 3798, 3799, 
+    3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, 3811, 
+    3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822, 3823, 
+    3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832, 3833, 3834, 3835, 
+    3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, 3846, 3847, 
+    3848, 3849, 3850, 3851, 3852, 3853, 3854, 3855, 3856, 3857, 3858, 3859, 
+    3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, 3870, 3871, 
+    3872, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3881, 3882, 3883, 
+    3884, 3885, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 3893, 3894, 3895, 
+    3896, 3897, 3898, 3899, 3900, 3901, 3902, 3903, 3904, 3905, 3906, 3907, 
+    3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, 3918, 3919, 
+    3920, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, 3930, 3931, 
+    3932, 3933, 3934, 3935, 3936, 3937, 3938, 3939, 3940, 3941, 3942, 3943, 
+    3944, 3945, 3946, 3947, 3948, 3949, 3950, 3951, 3952, 3953, 3954, 3955, 
+    3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, 3966, 3967, 
+    3968, 3969, 3970, 3971, 3972, 3973, 3974, 3975, 3976, 3977, 3978, 3979, 
+    3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3989, 3990, 3991, 
+    3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, 
+    4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 
+    4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023, 4024, 4025, 4026, 4027, 
+    4028, 4029, 4030, 4031, 4032, 4033, 4034, 4035, 4036, 4037, 4038, 4039, 
+    4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050, 4051, 
+    4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, 4063, 
+    4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 
+    4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, 4086, 4087, 
+    4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, 4098, 4099, 
+    4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, 4111, 
+    4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, 4123, 
+    4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, 4135, 
+    4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, 4147, 
+    4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, 4159, 
+    4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171, 
+    4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, 4183, 
+    4184, 4185, 4186, 4187, 4188, 4189, 4190, 4191, 4192, 4193, 4194, 4195, 
+    4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 
+    4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4216, 4217, 4218, 4219, 
+    4220, 4221, 4222, 4223, 4224, 4225, 4226, 4227, 4228, 4229, 4230, 4231, 
+    4232, 4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241, 4242, 4243, 
+    4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, 4254, 4255, 
+    4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267, 
+    4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279, 
+    4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, 4291, 
+    4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, 4303, 
+    4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, 4314, 4315, 
+    4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326, 4327, 
+    4328, 4329, 4330, 4331, 4332, 4333, 4334, 4335, 4336, 4337, 4338, 4339, 
+    4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, 4351, 
+    4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, 4362, 4363, 
+    4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, 4375, 
+    4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, 4387, 
+    4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 4396, 4397, 4398, 4399, 
+    4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4409, 4410, 4411, 
+    4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4423, 
+    4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, 4435, 
+    4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, 4446, 4447, 
+    4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4459, 
+    4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, 4470, 4471, 
+    4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482, 4483, 
+    4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, 4493, 4494, 4495, 
+    4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4505, 4506, 4507, 
+    4508, 4509, 4510, 4511, 4512, 4513, 4514, 4515, 4516, 4517, 4518, 4519, 
+    4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530, 4531, 
+    4532, 4533, 4534, 4535, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4543, 
+    4544, 4545, 4546, 4547, 4548, 4549, 4550, 4551, 4552, 4553, 4554, 4555, 
+    4556, 4557, 4558, 4559, 4560, 4561, 4562, 4563, 4564, 4565, 4566, 4567, 
+    4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, 4579, 
+    4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, 4590, 4591, 
+    4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, 4603, 
+    4604, 4605, 4606, 4607, 4608, 4609, 4610, 4611, 4612, 4613, 4614, 4615, 
+    4616, 4617, 4618, 4619, 4620, 4621, 4622, 4623, 4624, 4625, 4626, 4627, 
+    4628, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4638, 4639, 
+    4640, 4641, 4642, 4643, 4644, 4645, 4646, 4647, 4648, 4649, 4650, 4651, 
+    4652, 4653, 4654, 4655, 4656, 4657, 4658, 4659, 4660, 4661, 4662, 4663, 
+    4664, 4665, 4666, 4667, 4668, 4669, 4670, 4671, 4672, 4673, 4674, 4675, 
+    4676, 4677, 4678, 4679, 4680, 4681, 4682, 4683, 4684, 4685, 4686, 4687, 
+    4688, 4689, 4690, 4691, 4692, 4693, 4694, 4695, 4696, 4697, 4698, 4699, 
+    4700, 4701, 4702, 4703, 4704, 4705, 4706, 4707, 4708, 4709, 4710, 4711, 
+    4712, 4713, 4714, 4715, 4716, 4717, 4718, 4719, 4720, 4721, 4722, 4723, 
+    4724, 4725, 4726, 4727, 4728, 4729, 4730, 4731, 4732, 4733, 4734, 4735, 
+    4736, 4737, 4738, 4739, 4740, 4741, 4742, 4743, 4744, 4745, 4746, 4747, 
+    4748, 4749, 4750, 4751, 4752, 4753, 4754, 4755, 4756, 4757, 4758, 4759, 
+    4760, 4761, 4762, 4763, 4764, 4765, 4766, 4767, 4768, 4769, 4770, 4771, 
+    4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, 4782, 4783, 
+    4784, 4785, 4786, 4787, 4788, 4789, 4790, 4791, 4792, 4793, 4794, 4795, 
+    4796, 4797, 4798, 4799, 4800, 4801, 4802, 4803, 4804, 4805, 4806, 4807, 
+    4808, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4816, 4817, 4818, 4819, 
+    4820, 4821, 4822, 4823, 4824, 4825, 4826, 4827, 4828, 4829, 4830, 4831, 
+    4832, 4833, 4834, 4835, 4836, 4837, 4838, 4839, 4840, 4841, 4842, 4843, 
+    4844, 4845, 4846, 4847, 4848, 4849, 4850, 4851, 4852, 4853, 4854, 4855, 
+    4856, 4857, 4858, 4859, 4860, 4861, 4862, 4863, 4864, 4865, 4866, 4867, 
+    4868, 4869, 4870, 4871, 4872, 4873, 4874, 4875, 4876, 4877, 4878, 4879, 
+    4880, 4881, 4882, 4883, 4884, 4885, 4886, 4887, 4888, 4889, 4890, 4891, 
+    4892, 4893, 4894, 4895, 4896, 4897, 4898, 4899, 4900, 4901, 4902, 4903, 
+    4904, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913, 4914, 4915, 
+    4916, 4917, 4918, 4919, 4920, 4921, 4922, 4923, 4924, 4925, 4926, 4927, 
+    4928, 4929, 4930, 4931, 4932, 4933, 4934, 4935, 4936, 4937, 4938, 4939, 
+    4940, 4941, 4942, 4943, 4944, 4945, 4946, 4947, 4948, 4949, 4950, 4951, 
+    4952, 4953, 4954, 4955, 4956, 4957, 4958, 4959, 4960, 4961, 4962, 4963, 
+    4964, 4965, 4966, 4967, 4968, 4969, 4970, 4971, 4972, 4973, 4974, 4975, 
+    4976, 4977, 4978, 4979, 4980, 4981, 4982, 4983, 4984, 4985, 4986, 4987, 
+    4988, 4989, 4990, 4991, 4992, 4993, 4994, 4995, 4996, 4997, 4998, 4999, 
+    5000, 5001, 5002, 5003, 5004, 5005, 5006, 5007, 5008, 5009, 5010, 5011, 
+    5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020, 5021, 5022, 5023, 
+    5024, 5025, 5026, 5027, 5028, 5029, 5030, 5031, 5032, 5033, 5034, 5035, 
+    5036, 5037, 5038, 5039, 5040, 5041, 5042, 5043, 5044, 5045, 5046, 5047, 
+    5048, 5049, 5050, 5051, 5052, 5053, 5054, 5055, 5056, 5057, 5058, 5059, 
+    5060, 5061, 5062, 5063, 5064, 5065, 5066, 5067, 5068, 5069, 5070, 5071, 
+    5072, 5073, 5074, 5075, 5076, 5077, 5078, 5079, 5080, 5081, 5082, 5083, 
+    5084, 5085, 5086, 5087, 5088, 5089, 5090, 5091, 5092, 5093, 5094, 5095, 
+    5096, 5097, 5098, 5099, 5100, 5101, 5102, 5103, 5104, 5105, 5106, 5107, 
+    5108, 5109, 5110, 5111, 5112, 5113, 5114, 5115, 5116, 5117, 5118, 5119 ;
+}
diff --git a/dap4_test/d4test_common.sh b/dap4_test/d4test_common.sh
index aa00e5a455..1955e99c6c 100755
--- a/dap4_test/d4test_common.sh
+++ b/dap4_test/d4test_common.sh
@@ -24,7 +24,7 @@ cd ${srcdir}/baseline; BASELINE=`pwd` ; cd ${WD}
 cd ${srcdir}/baselineraw; BASELINERAW=`pwd` ; cd ${WD}
 cd ${srcdir}/baselineremote; BASELINEREM=`pwd` ; cd ${WD}
 cd ${srcdir}/baselinehyrax; BASELINEH=`pwd` ; cd ${WD}
-#cd ${srcdir}/baselinethredds; BASELINETH=`pwd` ; cd ${WD}
+cd ${srcdir}/baselinethredds; BASELINETH=`pwd` ; cd ${WD}
 
 setresultdir() {
 rm -fr ${builddir}/$1
@@ -55,6 +55,23 @@ filesexist() {
     done
 }
 
+urlbasename() {
+    constraint=`echo "$1" | cut -d '?' -f2`
+    unconstrained=`echo "$1" | cut -d '?' -f1`
+    base=`basename $unconstrained`
+    prefix=`dirname $unconstrained`
+}
+
+makeurl() {
+    urlbasename "$2"
+    if test "x$constraint" = "x$unconstrained" ; then
+        URL="$1/${prefix}/${base}${FRAG}"
+    else
+	URL="$1/${prefix}/${base}?$constraint${FRAG}"
+    fi
+}
+
+
 finish() {
 if test "x$FAILURES" = x1 ; then
 echo "*** Fail"
diff --git a/dap4_test/test_common.h b/dap4_test/test_common.h
index d037964945..b2f4805ad0 100644
--- a/dap4_test/test_common.h
+++ b/dap4_test/test_common.h
@@ -105,9 +105,10 @@ setup(int tdmr, int argc, char** argv)
     if(translatenc4)
 	controller->controls.translation = NCD4_TRANSNC4;
     NCD4_applyclientparamcontrols(controller);
-    if((metadata=NCD4_newmeta(controller, ncbyteslength(input),ncbytescontents(input)))==NULL)
+    if((metadata=NCD4_newmeta(controller))==NULL)
 	fail(NC_ENOMEM);
     metadata->mode = mode;
+    NCD4_attachraw(metadata, ncbyteslength(input),ncbytescontents(input));
 
     if((ret=NCD4_dechunk(metadata))) /* ok for mode == DMR or mode == DAP */
 	fail(ret);
diff --git a/dap4_test/test_hyrax.sh b/dap4_test/test_hyrax.sh
index 62ba0c1666..83ddc7efb4 100755
--- a/dap4_test/test_hyrax.sh
+++ b/dap4_test/test_hyrax.sh
@@ -3,7 +3,6 @@
 if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi
 export srcdir;
 
-if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh
 
 . ${srcdir}/d4test_common.sh
@@ -30,15 +29,7 @@ setresultdir results_test_hyrax
 
 if test "x${RESET}" = x1 ; then rm -fr ${BASELINEH}/*.hyrax ; fi
 for f in $F ; do
-    constraint=`echo "$f" | cut -d '?' -f2`
-    unconstrained=`echo "$f" | cut -d '?' -f1`
-    base=`basename $unconstrained`
-    prefix=`dirname $unconstrained`
-    if test "x$constraint" = "x$unconstrained" ; then
-        URL="dap4://test.opendap.org:8080/opendap/${prefix}/${base}${FRAG}"
-    else
-	URL="dap4://test.opendap.org:8080/opendap/${prefix}/${base}?$constraint${FRAG}"
-    fi
+    makeurl "dap4://test.opendap.org/opendap" "$f"
     echo "testing: $URL"
     if ! ${NCDUMP} "${URL}" > ./results_test_hyrax/${base}.hyrax; then
         failure "${URL}"
diff --git a/dap4_test/test_thredds.sh b/dap4_test/test_thredds.sh
new file mode 100755
index 0000000000..99cbcccc32
--- /dev/null
+++ b/dap4_test/test_thredds.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi
+export srcdir;
+
+. ../test_common.sh
+
+. ${srcdir}/d4test_common.sh
+
+
+set -e
+echo "test_thredds.sh:"
+
+FRAG="#checksummode=ignore"
+
+F="\
+harvey/goes16/CONUS/Channel01/20170821/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4?dap4.ce=y \
+"
+
+FBAD="harvey/model/gfs_ana/GFS_Global_0p5deg_ana_20170820_0000.grib2 \
+      harvey/nexrad/KCRP/20170820/Level2_KCRP_20170820_020558.ar2v"
+
+failure() {
+      echo "*** Fail: $1"
+      exit 1
+}
+
+setresultdir results_test_thredds
+
+if test "x${RESET}" = x1 ; then rm -fr ${BASELINEH}/*.thredds ; fi
+for f in $F ; do
+    makeurl "dap4://thredds-test.unidata.ucar.edu/thredds/dap4/casestudies" "$f"
+    echo "testing: $URL"
+    if ! ${NCDUMP} "${URL}" > ./results_test_thredds/${base}.thredds; then
+        failure "${URL}"
+    fi
+    if test "x${TEST}" = x1 ; then
+	if ! diff -wBb ${BASELINETH}/${base}.thredds ./results_test_thredds/${base}.thredds ; then
+	    failure "diff ${base}.thredds"
+	fi
+    elif test "x${RESET}" = x1 ; then
+	echo "${f}:" 
+	cp ./results_test_thredds/${base}.thredds ${BASELINETH}/${base}.thredds
+    fi
+done
+
+echo "*** Pass"
+exit 0
+
diff --git a/libdap4/d4chunk.c b/libdap4/d4chunk.c
index 7f636162fb..94d5f8a1d7 100644
--- a/libdap4/d4chunk.c
+++ b/libdap4/d4chunk.c
@@ -47,38 +47,46 @@ NCD4_dechunk(NCD4meta* metadata)
     unsigned char *praw, *phdr, *pdap;
     NCD4HDR hdr;
 
-    if(metadata->mode == NCD4_DSR) 
-        return THROW(NC_EDMR);
-
-    /* Assume proper mode has been inferred already. */
-
-    /* Verify the mode; assume that the <?xml...?> is optional */
-    praw = metadata->serial.rawdata;
-    if(memcmp(praw,"<?xml",strlen("<?xml"))==0
-       || memcmp(praw,"<Dataset",strlen("<Dataset"))==0) {
-	size_t len = 0;
-        if(metadata->mode != NCD4_DMR) 
-            return THROW(NC_EDMR);
-        /* setup as dmr only */
-        /* Avoid strdup since rawdata might contain nul chars */
-	len = metadata->serial.rawsize;
-        if((metadata->serial.dmr = malloc(len+1)) == NULL)
-            return THROW(NC_ENOMEM);    
-        memcpy(metadata->serial.dmr,praw,len);
-        metadata->serial.dmr[len] = '\0';
-        /* Suppress nuls */
-        (void)NCD4_elidenuls(metadata->serial.dmr,len);
-        return THROW(NC_NOERR); 
-    }
-
 #ifdef D4DUMPRAW
     NCD4_tagdump(metadata->serial.rawsize,metadata->serial.rawdata,0,"RAW");
 #endif
 
+    /* Access the returned raw data */
+    praw = metadata->serial.rawdata;
+
+    if(metadata->mode == NCD4_DSR) {
+	return THROW(NC_EDMR);
+    } else if(metadata->mode == NCD4_DMR) {
+        /* Verify the mode; assume that the <?xml...?> is optional */
+        if(memcmp(praw,"<?xml",strlen("<?xml"))==0
+           || memcmp(praw,"<Dataset",strlen("<Dataset"))==0) {
+	    size_t len = 0;
+	    /* setup as dmr only */
+            /* Avoid strdup since rawdata might contain nul chars */
+	    len = metadata->serial.rawsize;
+            if((metadata->serial.dmr = malloc(len+1)) == NULL)
+                return THROW(NC_ENOMEM);    
+            memcpy(metadata->serial.dmr,praw,len);
+            metadata->serial.dmr[len] = '\0';
+            /* Suppress nuls */
+            (void)NCD4_elidenuls(metadata->serial.dmr,len);
+            return THROW(NC_NOERR); 
+	}
+    } else if(metadata->mode != NCD4_DAP)
+    	return THROW(NC_EDAP);
+
     /* We must be processing a DAP mode packet */
     praw = (metadata->serial.dap = metadata->serial.rawdata);
     metadata->serial.rawdata = NULL;
 
+    /* If the raw data looks like xml, then we almost certainly have an error */
+    if(memcmp(praw,"<?xml",strlen("<?xml"))==0
+           || memcmp(praw,"<!doctype",strlen("<!doctype"))==0) {
+	/* Set up to report the error */
+	int stat = NCD4_seterrormessage(metadata, metadata->serial.rawsize, metadata->serial.rawdata);
+        return THROW(stat); /* slight lie */
+    }
+
     /* Get the DMR chunk header*/
     phdr = NCD4_getheader(praw,&hdr,metadata->serial.hostlittleendian);
     if(hdr.count == 0)
diff --git a/libdap4/d4file.c b/libdap4/d4file.c
index 47a460562b..c4e0372a23 100644
--- a/libdap4/d4file.c
+++ b/libdap4/d4file.c
@@ -145,14 +145,16 @@ NCD4_open(const char * path, int mode,
     /* Always start by reading the DMR only */
     /* reclaim substrate.metadata */
     resetInfoforRead(d4info);
+    /* Rebuild metadata */
+    if((d4info->substrate.metadata=NCD4_newmeta(d4info))==NULL)
+	{ret = NC_ENOMEM; goto done;}
 
     if((ret=NCD4_readDMR(d4info, d4info->controls.flags.flags))) goto done;
 
-    /* (Re)Build the meta data; sets serial.rawdata */
+    /* set serial.rawdata */
     len = ncbyteslength(d4info->curl->packet);
     contents = ncbytesextract(d4info->curl->packet);
-    if((d4info->substrate.metadata=NCD4_newmeta(d4info, len, contents))==NULL)
-	{ret = NC_ENOMEM; goto done;}
+    NCD4_attachraw(d4info->substrate.metadata, len, contents);
 
     meta = d4info->substrate.metadata;
 
diff --git a/libdap4/d4http.c b/libdap4/d4http.c
index 58095dce60..4d3e02d378 100644
--- a/libdap4/d4http.c
+++ b/libdap4/d4http.c
@@ -87,7 +87,7 @@ NCD4_fetchurl_file(CURL* curl, const char* url, FILE* stream,
 }
 
 int
-NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime)
+NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime, int* httpcodep)
 {
     int ret = NC_NOERR;
     CURLcode cstat = CURLE_OK;
@@ -97,12 +97,12 @@ NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime)
     /* send all data to this function  */
     cstat = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
     if (cstat != CURLE_OK)
-        goto fail;
+        goto done;
 
     /* we pass our file to the callback function */
     cstat = curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)buf);
     if (cstat != CURLE_OK)
-        goto fail;
+        goto done;
 
     /* One last thing; always try to get the last modified time */
     cstat = curl_easy_setopt(curl, CURLOPT_FILETIME, (long)1);
@@ -111,7 +111,7 @@ NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime)
     cstat = curl_easy_setopt(curl, CURLOPT_URL, (void*)"");
     cstat = curl_easy_setopt(curl, CURLOPT_URL, (void*)url);
     if (cstat != CURLE_OK)
-        goto fail;
+        goto done;
 
     cstat = curl_easy_perform(curl);
 
@@ -121,14 +121,15 @@ NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime)
                curl_easy_strerror(cstat));
         cstat = CURLE_OK;
     }
-    httpcode = NCD4_fetchhttpcode(curl);
+    if(cstat != CURLE_OK) goto done;
 
-    if(cstat != CURLE_OK) goto fail;
+    httpcode = NCD4_fetchhttpcode(curl);
+    if(httpcodep) *httpcodep = httpcode;
 
     /* Get the last modified time */
     if(filetime != NULL)
         cstat = curl_easy_getinfo(curl,CURLINFO_FILETIME,filetime);
-    if(cstat != CURLE_OK) goto fail;
+    if(cstat != CURLE_OK) goto done;
 
     /* Null terminate the buffer*/
     len = ncbyteslength(buf);
@@ -137,19 +138,19 @@ NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime)
 #ifdef D4DEBUG
     nclog(NCLOGNOTE,"buffersize: %lu bytes",(d4size_t)ncbyteslength(buf));
 #endif
-    return THROW(ret);
 
-fail:
+done:
     if(cstat != CURLE_OK) {
         nclog(NCLOGERR, "curl error: %s", curl_easy_strerror(cstat));
         ret = curlerrtoncerr(cstat);
     } else switch (httpcode) {
-    case 401: ret = NC_EACCESS; break;
-    case 403: ret = NC_EAUTH; break;
-    case 404: ret = ENOENT; break;
-    case 500: ret = NC_EDAPSVC; break;
-    case 200: break;
-    default: ret = NC_ECURL; break;
+           case 400: ret = NC_EDATADAP; break;
+           case 401: ret = NC_EACCESS; break;
+	   case 403: ret = NC_EAUTH; break;
+           case 404: ret = ENOENT; break;
+           case 500: ret = NC_EDAPSVC; break;
+           case 200: break;
+           default: ret = NC_ECURL; break;
     }
     return THROW(ret);
 }
@@ -291,7 +292,7 @@ NCD4_ping(const char* url)
 
     /* Try to get the file */
     buf = ncbytesnew();
-    ret = NCD4_fetchurl(curl,url,buf,NULL);
+    ret = NCD4_fetchurl(curl,url,buf,NULL,NULL);
     if(ret == NC_NOERR) {
         /* Don't trust curl to return an error when request gets 404 */
         long http_code = 0;
diff --git a/libdap4/d4meta.c b/libdap4/d4meta.c
index a33ce8a53f..7e1af13475 100644
--- a/libdap4/d4meta.c
+++ b/libdap4/d4meta.c
@@ -96,12 +96,11 @@ NCD4_metabuild(NCD4meta* metadata, int ncid)
 */
 
 NCD4meta*
-NCD4_newmeta(NCD4INFO* info, size_t rawsize, void* rawdata)
+NCD4_newmeta(NCD4INFO* info)
 {
     NCD4meta* meta = (NCD4meta*)calloc(1,sizeof(NCD4meta));
     if(meta == NULL) return NULL;
     meta->allnodes = nclistnew();
-    NCD4_resetSerial(&meta->serial,rawsize,rawdata);
 #ifdef D4DEBUG
     meta->debuglevel = 1;
 #endif
@@ -110,6 +109,14 @@ NCD4_newmeta(NCD4INFO* info, size_t rawsize, void* rawdata)
     return meta;
 }
 
+/* Attach raw data to metadata */
+void
+NCD4_attachraw(NCD4meta* meta, size_t rawsize, void* rawdata)
+{
+    assert(meta != NULL);
+    NCD4_resetSerial(&meta->serial,rawsize,rawdata);
+}
+
 void
 NCD4_setdebuglevel(NCD4meta* meta, int debuglevel)
 {
diff --git a/libdap4/d4read.c b/libdap4/d4read.c
index 0d432be307..cc5fcb277a 100644
--- a/libdap4/d4read.c
+++ b/libdap4/d4read.c
@@ -84,7 +84,10 @@ NCD4_readDAP(NCD4INFO* state, int flags)
     if((flags & NCF_ONDISK) == 0) {
 	ncbytesclear(state->curl->packet);
         stat = readpacket(state,state->uri,state->curl->packet,NCD4_DAP,NCD4_FORMAT_NONE,&lastmod);
-        if(stat == NC_NOERR)
+	if(stat) {
+	    NCD4_seterrormessage(state->substrate.metadata, nclistlength(state->curl->packet), nclistcontents(state->curl->packet));
+	    goto done;
+	} else
             state->data.daplastmodified = lastmod;
     } else { /*((flags & NCF_ONDISK) != 0) */
         NCURI* url = state->uri;
@@ -110,6 +113,7 @@ NCD4_readDAP(NCD4INFO* state, int flags)
                 state->data.daplastmodified = lastmod;
         }
     }
+done:
     return THROW(stat);
 }
 
@@ -170,6 +174,7 @@ readpacket(NCD4INFO* state, NCURI* url, NCbytes* packet, NCD4mode dxx, NCD4forma
     } else {
         char* fetchurl = NULL;
 	int flags = NCURIBASE;
+
 	if(!fileprotocol) flags |= NCURIQUERY;
 	flags |= NCURIENCODE;
         fetchurl = ncuribuild(url,NULL,suffix,flags);
@@ -180,7 +185,7 @@ readpacket(NCD4INFO* state, NCURI* url, NCbytes* packet, NCD4mode dxx, NCD4forma
    	    gettimeofday(&time0,NULL);
 #endif
 	}
-        stat = NCD4_fetchurl(curl,fetchurl,packet,lastmodified);
+        stat = NCD4_fetchurl(curl,fetchurl,packet,lastmodified,&state->substrate.metadata->error.httpcode);
         nullfree(fetchurl);
 	if(stat) goto fail;
 	if(FLAGSET(state->controls.flags,NCF_SHOWFETCH)) {
@@ -357,3 +362,15 @@ readfileDAPDMR(NCD4INFO* state, const NCURI* uri, NCbytes* packet)
 done:
     return THROW(stat);
 }
+
+/* Extract packet as error message; assume httpcode set */
+int
+NCD4_seterrormessage(NCD4meta* metadata, size_t len, char* msg)
+{
+    metadata->error.message = (char*)d4alloc(len+1);
+    if(metadata->error.message == NULL)
+        return THROW(NC_ENOMEM);
+    memcpy(metadata->error.message,msg,len);
+    metadata->error.message[len] = '\0';
+    return THROW(NC_ENODATA); /* slight lie */
+}
diff --git a/libdap4/d4util.c b/libdap4/d4util.c
index cc27ef1f51..afe873e4e1 100644
--- a/libdap4/d4util.c
+++ b/libdap4/d4util.c
@@ -483,3 +483,13 @@ NCD4_getheader(void* p, NCD4HDR* hdr, int hostlittleendian)
     hdr->count = *(unsigned int*)bytes; /* get count */
     return p;
 }
+
+void
+NCD4_reporterror(NCD4INFO* state)
+{
+    NCD4meta* meta = state->substrate.metadata;
+    char* u = NULL;
+    if(meta == NULL) return;
+    u = ncuribuild(state->uri,NULL,NULL,NCURIALL);     
+    fprintf(stderr,"***FAIL: url=%s httpcode=%d errmsg->\n%s\n",u,meta->error.httpcode,meta->error.message);
+}
diff --git a/libdap4/d4varx.c b/libdap4/d4varx.c
index cf059fe553..891106f8b9 100644
--- a/libdap4/d4varx.c
+++ b/libdap4/d4varx.c
@@ -155,7 +155,7 @@ getvarx(int ncid, int varid, NCD4INFO** infop, NCD4node** varp,
 	NCD4_resetSerial(&meta->serial, len, content);
         /* Process the data part */
         if((ret=NCD4_dechunk(meta))) goto done;
-            if((ret = NCD4_processdata(info->substrate.metadata))) goto done;
+        if((ret = NCD4_processdata(info->substrate.metadata))) goto done;
     }
 
     if((ret = NCD4_findvar(ncp,ncid,varid,&var,&group))) goto done;
@@ -186,6 +186,8 @@ getvarx(int ncid, int varid, NCD4INFO** infop, NCD4node** varp,
     if(nc4sizep) *nc4sizep = instancesize;
     if(varp) *varp = var;
 done:
+    if(meta->error.message != NULL)
+	NCD4_reporterror(info);    /* Make sure the user sees this */
     return THROW(ret);    
 }
 
diff --git a/libdap4/ncd4.h b/libdap4/ncd4.h
index 6f60a7d859..e3ba3885f3 100644
--- a/libdap4/ncd4.h
+++ b/libdap4/ncd4.h
@@ -78,7 +78,7 @@ extern int dsp_open(const char* path, ND4dsp** dspp);
 /* From d4http.c */
 extern long NCD4_fetchhttpcode(CURL* curl);
 extern int NCD4_fetchurl_file(CURL* curl, const char* url, FILE* stream, d4size_t* sizep, long* filetime);
-extern int NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime);
+extern int NCD4_fetchurl(CURL* curl, const char* url, NCbytes* buf, long* filetime, int* httpcode);
 extern int NCD4_curlopen(CURL** curlp);
 extern void NCD4_curlclose(CURL* curl);
 extern int NCD4_fetchlastmodified(CURL* curl, char* url, long* filetime);
@@ -87,6 +87,7 @@ extern int NCD4_ping(const char* url);
 /* From d4read.c */
 extern int NCD4_readDMR(NCD4INFO* state, int flags);
 extern int NCD4_readDAP(NCD4INFO* state, int flags);
+extern int NCD4_seterrormessage(NCD4meta* metadata, size_t len, char* msg);
 
 /* From d4parser.c */
 extern int NCD4_parse(NCD4meta*);
@@ -98,7 +99,8 @@ extern int NCD4_defineattr(NCD4meta* meta, NCD4node* parent, const char* aname,
 extern int NCD4_print(NCD4meta*, NCbytes* output);
 
 /* From d4meta.c */
-extern NCD4meta* NCD4_newmeta(NCD4INFO*, size_t size, void* rawdata);
+extern NCD4meta* NCD4_newmeta(NCD4INFO*);
+extern void NCD4_attachraw(NCD4meta*, size_t size, void* rawdata);
 extern void NCD4_reclaimMeta(NCD4meta*);
 extern void NCD4_resetMeta(NCD4meta*);
 extern void reclaimNode(NCD4node* node);
@@ -139,6 +141,7 @@ extern char* NCD4_deescape(const char* esc);
 extern char* NCD4_entityescape(const char* s);
 extern size_t NCD4_elidenuls(char* s, size_t slen);
 extern void* NCD4_getheader(void* p, NCD4HDR* hdr, int hostlittleendian);
+extern void NCD4_reporterror(NCD4INFO* state);
 
 /* From d4dump.c */
 extern void NCD4_dumpbytes(size_t size, const void* data0, int swap);
diff --git a/libdap4/ncd4dispatch.c b/libdap4/ncd4dispatch.c
index ba14181998..3f887a7e76 100644
--- a/libdap4/ncd4dispatch.c
+++ b/libdap4/ncd4dispatch.c
@@ -42,6 +42,8 @@ const NC_Dispatch* NCD4_dispatch_table = NULL; /* moved here from ddispatch.c */
 static const NC_reservedatt NCD4_reserved[] = {
     {D4CHECKSUMATTR, READONLYFLAG|NAMEONLYFLAG},      /*_DAP4_Checksum_CRC32*/
     {D4LEATTR, READONLYFLAG|NAMEONLYFLAG},            /*_DAP4_Little_Endian*/
+    /* Also need to include the provenance attributes */
+    {NCPROPS, READONLYFLAG|NAMEONLYFLAG|MATERIALIZEDFLAG},		/*_NCProperties*/
     {NULL, 0}
 };
 
diff --git a/libdap4/ncd4types.h b/libdap4/ncd4types.h
index bd1605b79c..cf1bfcd157 100644
--- a/libdap4/ncd4types.h
+++ b/libdap4/ncd4types.h
@@ -250,6 +250,7 @@ typedef struct NCD4serial {
     void* dap; /* pointer into rawdata where dap data starts */ 
     char* dmr;/* copy of dmr */ 
     char* errdata; /* null || error chunk (null terminated) */
+    int httpcode; /* returned from last request */
     int hostlittleendian; /* 1 if the host is little endian */
     int remotelittleendian; /* 1 if the packet says data is little endian */
 #ifdef CHECKSUMHACK
diff --git a/libdispatch/dinfermodel.c b/libdispatch/dinfermodel.c
index a92c7a80af..ba7db07e9b 100644
--- a/libdispatch/dinfermodel.c
+++ b/libdispatch/dinfermodel.c
@@ -166,7 +166,7 @@ static struct NCPROTOCOLLIST {
     {"file",NULL,NULL},
     {"dods","http","dap2"},
     {"dap4","http","dap4"},
-    {"s3","http","s3"},
+    {"s3","https","s3"},
     {NULL,NULL,NULL} /* Terminate search */
 };
 
diff --git a/nc_test4/tst_camrun.c b/nc_test4/tst_camrun.c
index 5b96bc3f89..bd3b4c8266 100644
--- a/nc_test4/tst_camrun.c
+++ b/nc_test4/tst_camrun.c
@@ -682,7 +682,7 @@ get_mem_used2(int *mem_used)
    snprintf(buf, 30, "/proc/%u/statm", (unsigned)getpid());
    if ((pf = fopen(buf, "r")))
    {
-      fscanf(pf, "%u %u %u %u %u %u", &size, &resident, &share,
+      (void)fscanf(pf, "%u %u %u %u %u %u", &size, &resident, &share,
 	     &text, &lib, &data);
       *mem_used = (data * page_size) / MEGABYTE;
    }

From d773076e281bdbf0a3d3fded41963b2567a03571 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 21 May 2021 20:49:01 -0600
Subject: [PATCH 2/2] Update release notes

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b2e126f3d5..3691e3b2d4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@ Release Notes       {#RELEASE_NOTES}
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 ## 4.8.1 - TBD
 
+* [Bug Fix] Fix bugs in libdap4. See [Github #2005](https://github.com/Unidata/netcdf-c/issues/2005).
 * [Bug Fix] Fix bug in NCclosedir in dpathmgr.c. See [Github #2003](https://github.com/Unidata/netcdf-c/issues/2003).
 * [Bug Fix] Fix bug in ncdump that assumes that there is a relationship between the total number of dimensions and the max dimension id. See [Github #2004](https://github.com/Unidata/netcdf-c/issues/2004).  
 * [Bug Fix] Fix bug in JSON processing of strings with embedded quotes. See [Github #1993](https://github.com/Unidata/netcdf-c/issues/1993).