move response for metadata to get current metadata

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 714e9a22489cffcd352e4f8cf7468d327471e674..100945b342048df1ef2e0962f20eec6803d6230d 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -26,6 +26,15 @@ scan_status current_scan_status;
 
 void _get_current_metadata()
 {
+       resp = kds_s2000w_client_response_init();
+       kds_s2000w_client_get_metadata(state->sessionid, current_scan_status.current_image_number, resp);
+       if (resp->code != 200) {
+               current_scan_status.mdata.valid = 0;
+               kds_s2000w_client_response_free(resp);
+               resp = NULL;
+               return;
+       }
+
        current_scan_status.mdata.valid = 0;
        json_object* metadataResp = NULL;
        json_object* metadata = NULL;
@@ -242,23 +251,11 @@ metadata kds_s2000w_handler_get_parameters()
        }
 
        _download_current_image();
-
+       _get_current_metadata();
+       _delete_current_image();
        printf("current available images: %i\n", current_scan_status.available_images);
        printf("current downloaded images: %i\n", current_scan_status.downloaded_images);
        printf("complete_scanned: %i\n", current_scan_status.complete_scanned);
 
-       resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_get_metadata(state->sessionid, current_scan_status.current_image_number, resp);
-       if (resp->code != 200) {
-               current_scan_status.mdata.valid = 0;
-               kds_s2000w_client_response_free(resp);
-               resp = NULL;
-               return current_scan_status.mdata;
-       }
-
-       _get_current_metadata();
-
-       _delete_current_image();
-
        return current_scan_status.mdata;
 }
\ No newline at end of file