remove client get metadata

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b463696c3b8b06e0f96b0c3f3485513fb71d74be..9d19da8a889f046ee43ee79017d8ceb1d8c05678 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ IF (RUN_TESTS)
 --wrap,kds_s2000w_client_close_session,\
 --wrap,kds_s2000w_client_status_session,\
 --wrap,kds_s2000w_client_get_image,\
---wrap,kds_s2000w_client_get_metadata,\
 --wrap,kds_s2000w_convert_tiff_to_pnm,\
 --wrap,kds_s2000w_client_delete_image,\
 --wrap,kds_s2000w_client_set_option,\

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 35e748cbfd46a4928a64a4a1adde6bf233dfaef9..16f67146e73791d5a7d5d02426b3dbe1c1758cb9 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -307,54 +307,6 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
        return result;
 }
 
-int kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response)
-{
-       debug_printf(ALL, "kds_s2000w_client_get_metadata");
-       CURL* curl = NULL;
-       CURLU* url_handler = NULL;
-       struct curl_slist* headers = NULL;
-       char header_str[80];
-       CURLcode result = 0;
-
-       curl = curl_easy_init();
-       if(!curl)
-               return CURLE_FAILED_INIT;
-
-       url_handler = curl_url();
-       char url_path[30];
-       sprintf(url_path, "api/session/metadata/%i", img_number);
-       curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
-       curl_url_set(url_handler, CURLUPART_PATH, url_path, 0);
-       char* url = NULL;
-       curl_url_get(url_handler, CURLUPART_URL, &url, 0);
-
-       headers = NULL;
-       sprintf(header_str, "SessionId: %li", sessionid);
-       headers = curl_slist_append(headers, header_str);
-       curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
-       curl_easy_setopt(curl, CURLOPT_URL, url);
-       curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_callback);
-       curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) response);
-       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-       result = curl_easy_perform(curl);
-       curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
-       _kds_s2000w_client_read_error_status(curl, response);
-
-       if (result != CURLE_OK)
-               fprintf(stderr, "ERROR: curl_easy_perform: %s\n", curl_easy_strerror(result));
-
-       curl_url_cleanup(url_handler);
-       url_handler = NULL;
-       curl_free(url);
-       url = NULL;
-       curl_easy_cleanup(curl);
-       curl = NULL;
-
-       return result;
-}
-
 int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response)
 {
        debug_printf(ALL, "kds_s2000w_client_get_image");

diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index 4b7ee7201b85e9443f05ea9031b4eaed0fc6e862..b79bb8afa42b09685a1a7f2f01ca251e96c34e0f 100644 (file)
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -15,7 +15,6 @@ void kds_s2000w_client_close_session(int64_t sessionid);
 int kds_s2000w_client_status_session(int64_t sessionid, response* response);
 int kds_s2000w_client_start_scan(int64_t sessionid, response* response);
 int kds_s2000w_client_stop_scan(int64_t sessionid, response* response);
-int kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response);
 int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response);
 int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response);
 int kds_s2000w_client_get_capabilities(response* response);

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index f1c10e060e40575e00b29fb5704dd6a59d6b3fcf..22c2df49f866b36c3db9c34271088a4811486194 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -57,13 +57,6 @@ int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, respon
        return mock_type(int);
 }
 
-int __wrap_kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response)
-{
-       function_called();
-       mock_response(response);
-       return mock_type(int);
-}
-
 int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response)
 {
        function_called();