Description
Marcel de Rooy
2017-11-16 10:42:58 UTC
Created attachment 72084 [details] [review] Bug 19633: Use alphanumeric error codes in upload The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl. It would be nice to use alphanumeric codes instead. No behavior change expected. Test plan: [1] Run t/db_dependent/Upload.t [2] Verify that a regular upload with tools/upload.pl still works. [3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache and try to upload to a category. Correct error message? [4] Upload the same file twice to the same category. Correct error message the second time? Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 72919 [details] [review] Bug 19633: Use alphanumeric error codes in upload The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl. It would be nice to use alphanumeric codes instead. No behavior change expected. Test plan: [1] Run t/db_dependent/Upload.t [2] Verify that a regular upload with tools/upload.pl still works. [3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache and try to upload to a category. Correct error message? [4] Upload the same file twice to the same category. Correct error message the second time? Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Created attachment 74722 [details] [review] Bug 19633: Use alphanumeric error codes in upload The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl. It would be nice to use alphanumeric codes instead. No behavior change expected. Test plan: [1] Run t/db_dependent/Upload.t [2] Verify that a regular upload with tools/upload.pl still works. [3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache and try to upload to a category. Correct error message? [4] Upload the same file twice to the same category. Correct error message the second time? Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Rebased in connection with [% Asset.js("js/file-upload.js") %] Ok but I would have written use constant UPLERR_ALREADY_EXISTS => 'UPLERR_ALREADY_EXISTS'; instead of use constant ERRCODE_1 => 'UPLERR_ALREADY_EXISTS'; or even get rid of the constant if only used once. The goal is to make the code more readable, but when you see ERRCODE_X in the perl script you still do not know what it means :) (In reply to Jonathan Druart from comment #5) > Ok but I would have written > > use constant UPLERR_ALREADY_EXISTS => 'UPLERR_ALREADY_EXISTS'; > instead of > use constant ERRCODE_1 => 'UPLERR_ALREADY_EXISTS'; > > or even get rid of the constant if only used once. > > The goal is to make the code more readable, but when you see ERRCODE_X in > the perl script you still do not know what it means :) We still can do that later. This was kind of a safety step in between. Still knowing the old error number.. Created attachment 75856 [details] [review] Bug 19633: (QA follow-up) Really remove these ugly numbers See BZ comment5. We now remove the numbers also from the constant names. Test plan: Read the changes. Git grep "ERRCODE_" Run t/db_dependent/Upload.t (Note: You may see one failure here; it is fixed on bug 20727. So depends on who reaches master first.) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> (In reply to Jonathan Druart from comment #5) > Ok but I would have written > > use constant UPLERR_ALREADY_EXISTS => 'UPLERR_ALREADY_EXISTS'; > instead of > use constant ERRCODE_1 => 'UPLERR_ALREADY_EXISTS'; > > or even get rid of the constant if only used once. > > The goal is to make the code more readable, but when you see ERRCODE_X in > the perl script you still do not know what it means :) Giving in for high pressure Created attachment 77172 [details] [review] Bug 19633: Use alphanumeric error codes in upload The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl. It would be nice to use alphanumeric codes instead. No behavior change expected. Test plan: [1] Run t/db_dependent/Upload.t [2] Verify that a regular upload with tools/upload.pl still works. [3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache and try to upload to a category. Correct error message? [4] Upload the same file twice to the same category. Correct error message the second time? Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Created attachment 77173 [details] [review] Bug 19633: (QA follow-up) Really remove these ugly numbers See BZ comment5. We now remove the numbers also from the constant names. Test plan: Read the changes. Git grep "ERRCODE_" Run t/db_dependent/Upload.t (Note: You may see one failure here; it is fixed on bug 20727. So depends on who reaches master first.) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Awesome work all! Pushged to master for 18.11 Enhancement, won't be backported to 18.05.x series. |