projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 9924: (follow-up) ensure that correct error message is displayed
[koha.git]
/
patroncards
/
image-manage.pl
diff --git
a/patroncards/image-manage.pl
b/patroncards/image-manage.pl
index
f9f7eac
..
cf5257a
100755
(executable)
--- a/
patroncards/image-manage.pl
+++ b/
patroncards/image-manage.pl
@@
-54,8
+54,7
@@
if ($op eq 'upload') {
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
- error => 1,
- $errstr => 1,
+ error => $errstr,
);
}
else {
);
}
else {
@@
-69,8
+68,7
@@
if ($op eq 'upload') {
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
- error => 1,
- $errstr => 1,
+ error => $errstr,
);
}
else {
);
}
else {
@@
-87,8
+85,7
@@
if ($op eq 'upload') {
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
- error => 1,
- $errstr => 1,
+ error => $errstr,
image_limit => $image_limit,
);
}
image_limit => $image_limit,
);
}
@@
-120,8
+117,7
@@
elsif ($op eq 'delete') {
DELETE_SUCCESSFULL => 0,
IMAGE_IDS => join(', ', @image_ids),
TABLE => $table,
DELETE_SUCCESSFULL => 0,
IMAGE_IDS => join(', ', @image_ids),
TABLE => $table,
- error => 1,
- $errstr => 1,
+ error => $errstr,
image_ids => join(',',@image_ids),
);
}
image_ids => join(',',@image_ids),
);
}
@@
-149,8
+145,7
@@
else { # to trap unsupported operations
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
SOURCE_FILE => $source_file,
IMAGE_NAME => $image_name,
TABLE => $table,
- error => 1,
- $errstr => 1,
+ error => $errstr,
);
}
);
}