Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-27 02:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inline image references when moving entries between logbooks

Browse Source 
SVN revision: 2204
This commit is contained in:
Stefan Ritt 2009-06-04 13:35:01 +00:00
parent dd6ac8b93c
commit 53977b1d88
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/elogd.c
View File

@ -22547,7 +22547,7 @@ void submit_elog_mirror(LOGBOOK * lbs)
void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, int orig_id) void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, int orig_id)
{ {
int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id; int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id;
char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; char str[256], str2[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
char date[80], *text, msg_str[32], in_reply_to[80], reply_to[MAX_REPLY_TO * 10], char date[80], *text, msg_str[32], in_reply_to[80], reply_to[MAX_REPLY_TO * 10],
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], *buffer, attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], *buffer,
list[MAX_N_ATTR][NAME_LENGTH]; list[MAX_N_ATTR][NAME_LENGTH];
@ -22625,8 +22625,8 @@ void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, int orig_i
read(fh, buffer, size); read(fh, buffer, size);
close(fh); close(fh);
/* stip date/time from file name */ /* keep original file name for inline references */
strlcpy(file_name, attachment[i] + 14, NAME_LENGTH); strlcpy(file_name, attachment[i], NAME_LENGTH);
el_submit_attachment(lbs_dest, file_name, buffer, size, attachment[i]); el_submit_attachment(lbs_dest, file_name, buffer, size, attachment[i]);
@ -22637,6 +22637,22 @@ void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, int orig_i
attachment[i][0] = 0; attachment[i][0] = 0;
} }
/* correct possible references to attachments */
if (strieq(encoding, "ELCode")) {
sprintf(str, "[IMG]elog:%d/", src_id);
while (stristr(text, str))
strsubst(text, TEXT_SIZE, str, "[IMG]elog:/");
} else if (strieq(encoding, "HTML")) {
sprintf(str, "?lb=%s\"", lbs->name_enc);
sprintf(str2, "?lb=%s\"", dest_logbook);
while (stristr(text, str))
strsubst(text, TEXT_SIZE, str, str2);
sprintf(str, "?lb=%s&", lbs->name_enc);
sprintf(str2, "?lb=%s&", dest_logbook);
while (stristr(text, str))
strsubst(text, TEXT_SIZE, str, str2);
}
/* if called recursively (for threads), put in correct in_reply_to */ /* if called recursively (for threads), put in correct in_reply_to */
str[0] = 0; str[0] = 0;
if (orig_id) if (orig_id)