Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mirror errors for replies

Browse Source 
SVN revision: 709
This commit is contained in:
Stefan Ritt 2004-01-22 21:19:09 +00:00
parent b064062e02
commit f571ce9061
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.208 2004/01/22 21:19:09 midas
Fixed mirror errors for replies
Revision 1.207 2004/01/22 16:40:00 midas Revision 1.207 2004/01/22 16:40:00 midas
Keep attachment date/time on mirroring Keep attachment date/time on mirroring
@ -3281,7 +3284,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit,
/* file might have been edited, rebuild index */ /* file might have been edited, rebuild index */
el_build_index(lbs, TRUE); el_build_index(lbs, TRUE);
return el_submit(lbs, message_id, bedit, date, attr_name, attr_value, return el_submit(lbs, message_id, bedit, date, attr_name, attr_value,
n_attr, text, in_reply_to, reply_to, encoding, afilename, TRUE, n_attr, text, in_reply_to, reply_to, encoding, afilename, mark_original,
locked_by); locked_by);
} }
@ -8665,7 +8668,7 @@ void synchronize(LOGBOOK * lbs, char *path)
sprintf(loc_ref, "<a href=\"%d\">%s</a>", message_id, loc("local")); sprintf(loc_ref, "<a href=\"%d\">%s</a>", message_id, loc("local"));
sprintf(rem_ref, "<a href=\"http://%s%d\">%s</a>", str, message_id, sprintf(rem_ref, "<a href=\"http://%s%d\">%s</a>", str, message_id,
loc("remote")); loc("remote"));
rsprintf("%s\n\t", loc("Entry has been changed locally and remotely.")); rsprintf("%s.\n\t", loc("Entry has been changed locally and remotely"));
rsprintf(loc("Please delete %s or %s entry to resolve conflict"), rsprintf(loc("Please delete %s or %s entry to resolve conflict"),
loc_ref, rem_ref); loc_ref, rem_ref);
rsprintf(".\n"); rsprintf(".\n");
@ -8681,7 +8684,7 @@ void synchronize(LOGBOOK * lbs, char *path)
it must have been deleted remotely, so remove it locally */ it must have been deleted remotely, so remove it locally */
if (exist_cache && !exist_remote) { if (exist_cache && !exist_remote) {
el_delete_message(lbs, message_id, TRUE, NULL, TRUE, TRUE); el_delete_message(lbs, message_id, TRUE, NULL, TRUE, TRUE);
rsprintf("%s\n", loc("Entry has been deleted locally")); rsprintf("%s\n", loc("Entry deleted locally"));
md5_cache[i_cache].message_id = 0; md5_cache[i_cache].message_id = 0;
/* message got deleted from local message list, so redo current index */ /* message got deleted from local message list, so redo current index */
@ -8741,16 +8744,15 @@ void synchronize(LOGBOOK * lbs, char *path)
retrieve_url(url, &buffer); retrieve_url(url, &buffer);
if (strstr(buffer, "Location: ")) if (strstr(buffer, "Location: "))
rsprintf(loc("Entry deleted remotely")); rsprintf("%s\n", loc("Entry deleted remotely"));
else else
rsprintf(loc("Error deleting remote entry")); rsprintf("%s\n", loc("Error deleting remote entry"));
free(buffer); free(buffer);
} }
} }
} }
free(md5_remote); free(md5_remote);
/* save remote MD5s in file */ /* save remote MD5s in file */
@ -11453,7 +11455,8 @@ void submit_elog(LOGBOOK * lbs)
message_id = message_id =
el_submit(lbs, message_id, bedit, date, attr_list, attrib, lbs->n_attr, el_submit(lbs, message_id, bedit, date, attr_list, attrib, lbs->n_attr,
getparam("text"), in_reply_to, reply_to, getparam("text"), in_reply_to, reply_to,
*getparam("html") ? "HTML" : "plain", att_file, TRUE, NULL); *getparam("html") ? "HTML" : "plain", att_file,
!isparam("mirror_id"), NULL);
if (message_id <= 0) { if (message_id <= 0) {
sprintf(str, loc("New entry cannot be written to directory \"%s\""), sprintf(str, loc("New entry cannot be written to directory \"%s\""),