Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Evaluate "skiplock" parameter to make elog submissions work with "use lock=1"

Browse Source 
SVN revision: 2122
This commit is contained in:
Stefan Ritt 2008-08-11 08:14:42 +00:00
parent 722c4cf338
commit 9bbe6c0e97
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/elogd.c
View File

@ -21814,33 +21814,35 @@ void submit_elog(LOGBOOK * lbs)
} }
/* check if lock has been stolen */ /* check if lock has been stolen */
if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1 && message_id) { if (!isparam("skiplock")) {
el_retrieve(lbs, message_id, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, locked_by); if (getcfg(lbs->name, "Use Lock", str, sizeof(str)) && atoi(str) == 1 && message_id) {
el_retrieve(lbs, message_id, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, locked_by);
if (isparam("full_name")) if (isparam("full_name"))
strlcpy(str, getparam("full_name"), sizeof(str)); strlcpy(str, getparam("full_name"), sizeof(str));
else
strlcpy(str, loc("user"), sizeof(str));
strcat(str, " ");
strcat(str, loc("on"));
strcat(str, " ");
strcat(str, rem_host);
if (locked_by[0] == 0 || strcmp(locked_by, str) != 0) {
if (locked_by[0])
sprintf(str, loc("This entry has in meantime been locked by %s"), locked_by);
else else
sprintf(str, loc("This entry has in meantime been modified by someone else")); strlcpy(str, loc("user"), sizeof(str));
strlcat(str, ".<p>\n", sizeof(str));
strlcat(str,
loc("Submitting it now would overwrite the other modification and is therefore prohibited"),
sizeof(str));
strlcat(str, ".", sizeof(str));
strencode2(str2, str, sizeof(str2)); strcat(str, " ");
show_error(str2); strcat(str, loc("on"));
return; strcat(str, " ");
strcat(str, rem_host);
if (locked_by[0] == 0 || strcmp(locked_by, str) != 0) {
if (locked_by[0])
sprintf(str, loc("This entry has in meantime been locked by %s"), locked_by);
else
sprintf(str, loc("This entry has in meantime been modified by someone else"));
strlcat(str, ".<p>\n", sizeof(str));
strlcat(str,
loc("Submitting it now would overwrite the other modification and is therefore prohibited"),
sizeof(str));
strlcat(str, ".", sizeof(str));
strencode2(str2, str, sizeof(str2));
show_error(str2);
return;
}
} }
} }