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

- encoded logbook in case it contains blanks

Browse Source 
- added "skiplock" parameter to make elog work with "use lock=1"


SVN revision: 2121
This commit is contained in:
Stefan Ritt 2008-08-11 08:14:17 +00:00
parent d05ba238af
commit 722c4cf338
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elog.c
View File

@ -378,7 +378,7 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
\********************************************************************/ \********************************************************************/
{ {
int i, n, first, index, sock; int i, n, first, index, sock;
char str[80], *ph, *ps; char str[256], *ph, *ps;
#ifdef HAVE_SSL #ifdef HAVE_SSL
SSL *ssl_con; SSL *ssl_con;
#endif #endif
@ -400,12 +400,14 @@ INT retrieve_elog(char *host, int port, char *subdir, int ssl, char *experiment,
/* compose request */ /* compose request */
strcpy(request, "GET /"); strcpy(request, "GET /");
strlcpy(str, experiment, sizeof(str));
url_encode(str, sizeof(str));
if (subdir[0] && experiment[0]) if (subdir[0] && experiment[0])
sprintf(request + strlen(request), "%s/%s/%d?cmd=download", subdir, experiment, message_id); sprintf(request + strlen(request), "%s/%s/%d?cmd=download", subdir, str, message_id);
else if (subdir[0]) else if (subdir[0])
sprintf(request + strlen(request), "%s/%d?cmd=download", subdir, message_id); sprintf(request + strlen(request), "%s/%d?cmd=download", subdir, message_id);
else if (experiment[0]) else if (experiment[0])
sprintf(request + strlen(request), "%s/%d?cmd=download", experiment, message_id); sprintf(request + strlen(request), "%s/%d?cmd=download", str, message_id);
strcat(request, " HTTP/1.0\r\n"); strcat(request, " HTTP/1.0\r\n");
sprintf(request + strlen(request), "User-Agent: ELOG\r\n"); sprintf(request + strlen(request), "User-Agent: ELOG\r\n");
@ -808,9 +810,12 @@ INT submit_elog(char *host, int port, int ssl, char *subdir, char *experiment,
sprintf(content + strlen(content), sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"reply_to\"\r\n\r\n%d\r\n", boundary, reply); "%s\r\nContent-Disposition: form-data; name=\"reply_to\"\r\n\r\n%d\r\n", boundary, reply);
if (edit) if (edit) {
sprintf(content + strlen(content), sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"edit_id\"\r\n\r\n%d\r\n", boundary, edit); "%s\r\nContent-Disposition: form-data; name=\"edit_id\"\r\n\r\n%d\r\n", boundary, edit);
sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"skiplock\"\r\n\r\n1\r\n", boundary);
}
if (suppress) if (suppress)
sprintf(content + strlen(content), sprintf(content + strlen(content),