Merge pull request #135 from DenverM80/update_3_0

Fix encapsulating element label for parsing DetailedS3ObjectList and …

Author: rpmoore

src/ds3.c

@@ -12508,7 +12508,7 @@ static ds3_error* _parse_top_level_ds3_named_detailed_tape_partition_list_respon
     response = g_new0(ds3_named_detailed_tape_partition_list_response, 1);
 
     for (child_node = root->xmlChildrenNode; child_node != NULL; child_node = child_node->next) {
-        if (element_equal(child_node, "NamedDetailedTapePartition")) {
+        if (element_equal(child_node, "TapePartition")) {
             ds3_named_detailed_tape_partition_response* named_detailed_tape_partitions_response = NULL;
             error = _parse_ds3_named_detailed_tape_partition_response(client, doc, child_node, &named_detailed_tape_partitions_response);
             response->named_detailed_tape_partitions = (ds3_named_detailed_tape_partition_response**)named_detailed_tape_partitions_array->pdata;
@@ -13199,7 +13199,7 @@ static ds3_error* _parse_top_level_ds3_detailed_s3_object_list_response(const ds
     response = g_new0(ds3_detailed_s3_object_list_response, 1);
 
     for (child_node = root->xmlChildrenNode; child_node != NULL; child_node = child_node->next) {
-        if (element_equal(child_node, "DetailedS3Object")) {
+        if (element_equal(child_node, "Object")) {
             ds3_detailed_s3_object_response* detailed_s3_objects_response = NULL;
             error = _parse_ds3_detailed_s3_object_response(client, doc, child_node, &detailed_s3_objects_response);
             response->detailed_s3_objects = (ds3_detailed_s3_object_response**)detailed_s3_objects_array->pdata;

src/ds3.h

@@ -1893,6 +1893,7 @@ LIBRARY_API void ds3_request_set_sha256(ds3_request* request, const char* sha256
 LIBRARY_API void ds3_request_set_sha512(ds3_request* request, const char* sha512);
 LIBRARY_API void ds3_request_set_crc32(ds3_request* request, const char* crc32);
 LIBRARY_API void ds3_request_set_crc32c(ds3_request* request, const char* crc32c);
+// Any attempt to set a key with an empty or NULL value will be ignored.
 LIBRARY_API void ds3_request_set_metadata(ds3_request* request, const char* name, const char* value);
 
 LIBRARY_API void ds3_creds_free(ds3_creds* client);

test/search_tests.cpp

@@ -27,6 +27,31 @@ BOOST_AUTO_TEST_CASE( get_all_objects ) {
     free_client(client);
 }
 
+BOOST_AUTO_TEST_CASE( get_objects_with_full_details ) {
+    printf("-----Testing get_objects_with_full_details-------\n");
+
+    uint64_t num_objs;
+    ds3_client* client = get_client();
+    ds3_detailed_s3_object_list_response* response;
+    const char* bucket_name = "get_objects_with_full_details";
+    populate_with_objects(client, bucket_name);
+
+    ds3_request* request = ds3_init_get_objects_with_full_details_spectra_s3_request();
+    ds3_request_set_bucket_id(request, bucket_name);
+    ds3_request_set_name(request, "%txt%");
+    ds3_error* error = ds3_get_objects_with_full_details_spectra_s3_request(client, request, &response);
+
+    handle_error(error);
+    num_objs = response->num_detailed_s3_objects;
+    BOOST_CHECK_EQUAL(num_objs, 5);
+
+    ds3_request_free(request);
+    ds3_detailed_s3_object_list_response_free(response);
+
+    clear_bucket(client, bucket_name);
+    free_client(client);
+}
+
 BOOST_AUTO_TEST_CASE( get_no_objects ) {
     uint64_t num_objs;
     ds3_client* client = get_client();