Changeset dc8a553 in sasview

Timestamp:

Aug 9, 2016 6:41:15 AM (8 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0e11ec7

Parents:

9c500ab

Message:

Show error message when binary file can't be loaded

Location:

src/sas/sascalc/file_converter

Files:

• bsl_loader.py (modified) (1 diff)
• c_ext/bsl_loader.c (modified) (1 diff)

src/sas/sascalc/file_converter/bsl_loader.py

@@ -31 +31 @@
         sasdata_filename = filename.replace('000.', '001.')
         if sasdata_filename == filename:
-            err_msg = ("Invalid header filename {}.\n Should be of the format "
+            err_msg = ("Invalid header filename {}.\nShould be of the format "
                 "Xnn000.XXX where X is any alphanumeric character and n is any"
                 " digit.").format(filename)

src/sas/sascalc/file_converter/c_ext/bsl_loader.c

@@ -170 +170 @@
     input_file = fopen(self->params.filename, "rb");
     if (!input_file) {
+        // BSL filenames are 10 characters long
+        // Filename validity checked in bsl_loader.py
+        size_t filename_start = strlen(self->params.filename) - 10;
+        char *filename = self->params.filename + filename_start;
+        char *err_msg = (char *)malloc(sizeof(char) * 32);
+
+        sprintf(err_msg, "Unable to open file: %s", filename);
+
+        PyErr_SetString(PyExc_RuntimeError, err_msg);
+        free(err_msg);
         return NULL;
     }