Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ds3.c

Author: Rosen Nedyalkov

.gitignore

@@ -1,3 +1,4 @@
+core
 .*.swp
 Makefile
 Makefile.in

README.md

@@ -3,6 +3,11 @@ DS3 C SDK
 
 This project contains a C library for using the DS3 Deep Storage REST interface.
 
+Contact Us
+==========
+
+Join us at our [Google Groups](https://groups.google.com/d/forum/spectralogicds3-sdks) forum to ask questions, or see frequently asked questions.
+
 Windows
 =======
 
@@ -182,7 +187,7 @@ int main (int args, char * argv[]) {
 
     for (i = 0; i < response->num_buckets; i++) {
         ds3_bucket bucket = response->buckets[i];
-        printf("Bucket: (%s) created on %s\n", bucket.name, bucket.creation_date);
+        printf("Bucket: (%s) created on %s\n", bucket.name->value, bucket.creation_date->value);
     }
 
     ds3_free_service_response(response);
@@ -319,5 +324,6 @@ int main (int args, char * argv[]) {
 }
 ```
 
-The structure of the code is very similar to the previous examples.  Setup the client, setup the call, perform the call.  Every request follows this same pattern.  Things get a little more complicated with the bulk get/put cases.  The following bulk put will demonstrate some of those complexities
+The structure of the code is very similar to the previous examples.  Setup the client, setup the call, perform the call.  Every request follows this same pattern.
 
+Additional examples are available here: [samples](sample)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([ds3], [1.0], [[email protected]])
+AC_INIT([ds3], [1.1], [[email protected]])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 
@@ -9,7 +9,7 @@ AM_PROG_CC_C_O
 LT_INIT
 
 GLIB2_CHECK="glib-2.0 >= 2.34"
-LIBCURL_CHECK="libcurl >= 7.31"
+LIBCURL_CHECK="libcurl >= 7.29"
 LIBXML2_CHECK="libxml-2.0 >= 2.9"
 
 PKG_CHECK_MODULES([GLIB2], $GLIB2_CHECK)

sample/.gitignore

@@ -0,0 +1,4 @@
+get-service
+put-bulk
+put-bucket
+get-bucket

sample/Makefile

@@ -7,23 +7,40 @@ LIBS=`$(PKG_CONFIG) --libs libds3`
 CFLAGS=`$(PKG_CONFIG) --cflags libds3`
 CFLAGS+= -g -DDS3_LOG -Wall# Debug flags
 
-all: sample
-
-run: sample
-	LD_LIBRARY_PATH=../install/lib ./sample
+all: get-service get-bucket put-bulk
 
 deps:
 	./build_local.sh
 
-sample: main.o
-	$(CC) *.o $(CFLAGS) $(LIBS) -o sample
+run-get-service: get-service
+	LD_LIBRARY_PATH=../install/lib ./get-service
+
+get-service: get-service.o
+	$(CC) $< $(CFLAGS) $(LIBS) -o $@
+
+get-service.o: ../install/lib/pkgconfig/libds3.pc
+	$(CC) -c get-service.c $(CFLAGS)
+
+run-get-bucket: get-bucket
+	LD_LIBRARY_PATH=../install/lib ./get-bucket
+
+get-bucket: get-bucket.o
+	$(CC) $< $(CFLAGS) $(LIBS) -o $@
 
-main.o: ../install/lib/pkgconfig/libds3.pc
-	$(CC) -c main.c $(CFLAGS)
+get-bucket.o: ../install/lib/pkgconfig/libds3.pc
+	$(CC) -c get-bucket.c $(CFLAGS)
+
+run-put-bulk: put-bulk
+	LD_LIBRARY_PATH=../install/lib ./put-bulk
+
+put-bulk: put-bulk.o
+	$(CC) $< $(CFLAGS) $(LIBS) -o $@
+
+put-bulk.o: ../install/lib/pkgconfig/libds3.pc
+	$(CC) -c put-bulk.c $(CFLAGS)
 
 ../install/lib/pkgconfig/libds3.pc:
 	$(error SDK not built. Please run make deps)
 
 clean:
-	rm -f *.o sample
-
+	rm -f *.o get-service get-bucket put-bulk

sample/get-bucket.c

@@ -0,0 +1,77 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "ds3.h"
+
+int main(void) {
+
+    ///*
+    // Get Bucket
+
+    ds3_get_bucket_response *response;
+    uint64_t i;
+
+    // Setup client credentials and then the actual client itself.
+    ds3_creds * creds = ds3_create_creds("cnlhbg==","ZIjGDQAs");
+    ds3_client * client = ds3_create_client("http://192.168.56.101:8080", creds);
+
+    // You can optionally set a proxy server that a request should be sent through
+    //ds3_client_proxy(client, "192.168.56.1:8888");
+
+    char * bucket = "books";
+
+    // Create the get bucket request.
+    ds3_request* request = ds3_init_get_bucket(bucket);
+
+    // This performs the request to a DS3 appliance.
+    // If there is an error 'error' will not be NULL
+    // If the request completed successfully then 'error' will be NULL
+    ds3_error* error = ds3_get_bucket(client, request, &response);
+    ds3_free_request(request);
+
+    // Check that the request completed successfully
+    if(error != NULL) {
+        if(error->error != NULL) {
+            printf("Got an error (%lu): %s\n", error->error->status_code, error->message->value);
+            printf("Message Body: %s\n", error->error->error_body->value);
+        }
+        else {
+            printf("Got a runtime error: %s\n", error->message->value);
+        }
+        ds3_free_error(error);
+        ds3_free_creds(creds);
+        ds3_free_client(client);
+        return 1;
+    }
+
+    if (response == NULL) {
+        printf("Response was null\n");
+        ds3_free_creds(creds);
+        ds3_free_client(client);
+        return 1;
+    }
+
+    if(response->num_objects == 0) {
+        printf("No objects returned\n");
+        ds3_free_bucket_response(response);
+        ds3_free_creds(creds);
+        ds3_free_client(client);
+        return 0;
+    }
+
+    for (i = 0; i < response->num_objects; i++) {
+        ds3_object object = response->objects[i];
+        printf("Object: (%s) created on %s\n", object.name->value, object.last_modified->value);
+    }
+
+    ds3_free_bucket_response(response);
+
+    ds3_free_creds(creds);
+    ds3_free_client(client);
+    ds3_cleanup();
+
+    return 0;
+}

sample/main.c renamed to sample/get-service.c

@@ -6,11 +6,10 @@
 #include <sys/stat.h>
 #include "ds3.h"
 
-int main (int args, char * argv[]) {
-    /*
+int main (void) {
     // Get Service
 
-    ds3_get_service_response *response; 
+    ds3_get_service_response *response;
     uint64_t i;
 
     // Setup client credentials and then the actual client itself.
@@ -34,11 +33,11 @@ int main (int args, char * argv[]) {
     // Check that the request completed successfully
     if(error != NULL) {
         if(error->error != NULL) {
-            printf("Got an error (%lu): %s\n", error->error->status_code, error->message);
+            printf("Got an error (%lu): %s\n", error->error->status_code, error->message->value);
             printf("Message Body: %s\n", error->error->error_body);
         }
         else {
-            printf("Got a runtime error: %s\n", error->message);
+            printf("Got a runtime error: %s\n", error->message->value);
         }
         ds3_free_error(error);
         ds3_free_creds(creds);
@@ -63,7 +62,7 @@ int main (int args, char * argv[]) {
 
     for (i = 0; i < response->num_buckets; i++) {
         ds3_bucket bucket = response->buckets[i];
-        printf("Bucket: (%s) created on %s\n", bucket.name, bucket.creation_date);
+        printf("Bucket: (%s) created on %s\n", bucket.name->value, bucket.creation_date->value);
     }
 
     ds3_free_service_response(response);
@@ -72,65 +71,18 @@ int main (int args, char * argv[]) {
     ds3_free_client(client);
     ds3_cleanup();
 
-    */
-
     /*
     //Create Bucket
 
     ds3_creds * creds = ds3_create_creds("cnlhbg==","ZIjGDQAs");
     ds3_client * client = ds3_create_client("http://192.168.56.101:8080", creds);
-    
+
     //ds3_client_proxy(client, "192.168.56.1:8888");
     char * bucket = "books";
     ds3_request * create_bucket_request = ds3_init_put_bucket(bucket);
     ds3_error* error = ds3_put_bucket(client, create_bucket_request);
     ds3_free_request(create_bucket_request);
-    
-    if(error != NULL) {
-        if(error->error != NULL) {
-            printf("Got an error (%lu): %s\n", error->error->status_code, error->message);
-            printf("Message Body: %s\n", error->error->error_body);
-        }
-        else {
-            printf("Got a runtime error: %s\n", error->message);
-        }
-        ds3_free_error(error);
-        ds3_free_creds(creds);
-        ds3_free_client(client);
-        return 1;
-    }
-
-    printf("Successfully created bucket: %s\n", bucket);
-    ds3_free_creds(creds);
-    ds3_free_client(client);
-    ds3_cleanup();    
-    */
-
-    ///*
-    // Get Bucket
-
-    ds3_get_bucket_response *response; 
-    uint64_t i;
-
-    // Setup client credentials and then the actual client itself.
-    ds3_creds * creds = ds3_create_creds("cnlhbg==","ZIjGDQAs");
-    ds3_client * client = ds3_create_client("http://192.168.56.101:8080", creds);
-
-    // You can optionally set a proxy server that a request should be sent through
-    //ds3_client_proxy(client, "192.168.56.1:8888");
-
-    char * bucket = "books";
-
-    // Create the get bucket request.
-    ds3_request* request = ds3_init_get_bucket(bucket);
-
-    // This performs the request to a DS3 appliance.
-    // If there is an error 'error' will not be NULL
-    // If the request completed successfully then 'error' will be NULL
-    ds3_error* error = ds3_get_bucket(client, request, &response);
-    ds3_free_request(request);
 
-    // Check that the request completed successfully
     if(error != NULL) {
         if(error->error != NULL) {
             printf("Got an error (%lu): %s\n", error->error->status_code, error->message);
@@ -145,33 +97,12 @@ int main (int args, char * argv[]) {
         return 1;
     }
 
-    if (response == NULL) {
-        printf("Response was null\n");
-        ds3_free_creds(creds);
-        ds3_free_client(client);
-        return 1;
-    }
-
-    if(response->num_objects == 0) {
-        printf("No objects returned\n");
-        ds3_free_bucket_response(response);
-        ds3_free_creds(creds);
-        ds3_free_client(client);
-        return 0;
-    }
-
-    for (i = 0; i < response->num_objects; i++) {
-        ds3_object object = response->objects[i];
-        printf("Object: (%s) created on %s\n", object.name, object.last_modified);
-    }
-
-    ds3_free_bucket_response(response);
-
+    printf("Successfully created bucket: %s\n", bucket);
     ds3_free_creds(creds);
     ds3_free_client(client);
     ds3_cleanup();
+    */
 
-    //*/
 
     /*
     ds3_bulk_response *response;
@@ -192,11 +123,11 @@ int main (int args, char * argv[]) {
     ds3_free_bulk_response(response);
 
     ds3_free_bulk_object_list(list);
-    
+
     request = ds3_init_get_bucket(bucket);
 
     ds3_print_request(request);
-    
+
     ds3_get_bucket_response * bucket_response = ds3_get_bucket(client, request);
     ds3_free_request(request);
     for(n = 0; n < bucket_response->num_objects; n++) {
@@ -211,7 +142,7 @@ int main (int args, char * argv[]) {
 
     ds3_free_bucket_response(bucket_response);
 
-   
+
     char * object = "huckfinn.txt";
 
     struct stat st;
@@ -234,7 +165,7 @@ int main (int args, char * argv[]) {
 
     ds3_put_bucket(client, create_bucket_request);
     ds3_free_request(create_bucket_request);
-    
+
 
     request = ds3_init_get_service();
     ds3_get_service_response * response = ds3_get_service(client, request);
@@ -243,11 +174,11 @@ int main (int args, char * argv[]) {
     for(i = 0; i < response->num_buckets; i++) {
         ds3_bucket bucket = response->buckets[i];
         printf("Bucket: (%s) created on %s\n", bucket.name, bucket.creation_date);
-        
+
         request = ds3_init_get_bucket(bucket.name);
 
         ds3_print_request(request);
-        
+
         ds3_get_bucket_response * bucket_response = ds3_get_bucket(client, request);
         ds3_free_request(request);
         for(n = 0; n < bucket_response->num_objects; n++) {
@@ -266,6 +197,5 @@ int main (int args, char * argv[]) {
     ds3_free_service_response(response);
     */
 
-
     return 0;
 }

sample/put-bulk.c

@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "ds3.h"
+
+int main(void) {
+
+
+    return 0;
+}