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

Added -H flag for HTML submit

Browse Source 
SVN revision: 1124
This commit is contained in:
Stefan Ritt 2004-11-02 16:46:55 +00:00
parent 83df70ae72
commit 8727fbf87c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/elog.c
View File

@ -6,6 +6,9 @@
Contents: Electronic logbook utility Contents: Electronic logbook utility
$Log$ $Log$
Revision 1.22 2004/11/02 16:46:55 midas
Added -H flag for HTML submit
Revision 1.21 2004/09/18 04:42:46 midas Revision 1.21 2004/09/18 04:42:46 midas
Fixed bug with not displaying inline images Fixed bug with not displaying inline images
@ -560,6 +563,7 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment,
int reply, int reply,
int edit, int edit,
int suppress, int suppress,
int html,
char attrib_name[MAX_N_ATTR][NAME_LENGTH], char attrib_name[MAX_N_ATTR][NAME_LENGTH],
char attrib[MAX_N_ATTR][NAME_LENGTH], char attrib[MAX_N_ATTR][NAME_LENGTH],
int n_attr, int n_attr,
@ -581,6 +585,7 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment,
int reply Reply to existing message int reply Reply to existing message
int edit Edit existing message int edit Edit existing message
int suppress Suppress Email notification int suppress Suppress Email notification
int html Submit as HTML
char *attrib_name Attribute names char *attrib_name Attribute names
char *attrib Attribute values char *attrib Attribute values
char *text Message text char *text Message text
@ -676,7 +681,6 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment,
if (i < n_attr) if (i < n_attr)
encoding = attrib[i]; encoding = attrib[i];
strlcpy(new_text, text, sizeof(new_text)); strlcpy(new_text, text, sizeof(new_text));
/* precede old text with "> " */ /* precede old text with "> " */
@ -808,6 +812,10 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment,
sprintf(content + strlen(content), sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"suppress\"\r\n\r\n1\r\n", boundary); "%s\r\nContent-Disposition: form-data; name=\"suppress\"\r\n\r\n1\r\n", boundary);
if (html)
sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"html\"\r\n\r\n1\r\n", boundary);
for (i = 0; i < n_attr; i++) { for (i = 0; i < n_attr; i++) {
strcpy(str, attrib_name[i]); strcpy(str, attrib_name[i]);
btou(str); btou(str);
@ -956,12 +964,12 @@ int main(int argc, char *argv[])
char host_name[256], logbook[32], textfile[256], password[80], subdir[256]; char host_name[256], logbook[32], textfile[256], password[80], subdir[256];
char *buffer[MAX_ATTACHMENTS], attachment[MAX_ATTACHMENTS][256]; char *buffer[MAX_ATTACHMENTS], attachment[MAX_ATTACHMENTS][256];
INT att_size[MAX_ATTACHMENTS]; INT att_size[MAX_ATTACHMENTS];
INT i, n, fh, n_att, n_attr, size, port, reply, edit, suppress; INT i, n, fh, n_att, n_attr, size, port, reply, edit, suppress, html;
char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
text[0] = textfile[0] = uname[0] = upwd[0] = suppress = 0; text[0] = textfile[0] = uname[0] = upwd[0] = suppress = 0;
host_name[0] = logbook[0] = password[0] = subdir[0] = 0; host_name[0] = logbook[0] = password[0] = subdir[0] = 0;
n_att = n_attr = reply = edit = 0; n_att = n_attr = reply = edit = html = 0;
port = 80; port = 80;
for (i = 0; i < MAX_ATTACHMENTS; i++) { for (i = 0; i < MAX_ATTACHMENTS; i++) {
@ -976,6 +984,8 @@ int main(int argc, char *argv[])
verbose = 1; verbose = 1;
else if (argv[i][0] == '-' && argv[i][1] == 'x') else if (argv[i][0] == '-' && argv[i][1] == 'x')
suppress = 1; suppress = 1;
else if (argv[i][0] == '-' && argv[i][1] == 'H')
html = 1;
else { else {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
if (i + 1 >= argc || argv[i + 1][0] == '-') if (i + 1 >= argc || argv[i + 1][0] == '-')
@ -1026,6 +1036,7 @@ int main(int argc, char *argv[])
printf(" [-r <id>] Reply to existing message\n"); printf(" [-r <id>] Reply to existing message\n");
printf(" [-e <id>] Edit existing message\n"); printf(" [-e <id>] Edit existing message\n");
printf(" [-x] Suppress email notification\n"); printf(" [-x] Suppress email notification\n");
printf(" [-H] Submit entry in HTML format\n");
printf(" -m <textfile>] | <text>\n"); printf(" -m <textfile>] | <text>\n");
printf("\nArguments with blanks must be enclosed in quotes\n"); printf("\nArguments with blanks must be enclosed in quotes\n");
printf("The elog message can either be submitted on the command line, piped in like\n"); printf("The elog message can either be submitted on the command line, piped in like\n");
@ -1125,7 +1136,7 @@ int main(int argc, char *argv[])
/* now submit message */ /* now submit message */
submit_elog(host_name, port, subdir, logbook, password, submit_elog(host_name, port, subdir, logbook, password,
uname, upwd, reply, edit, suppress, attr_name, attrib, n_attr, text, uname, upwd, reply, edit, suppress, html, attr_name, attrib, n_attr, text,
attachment, buffer, att_size); attachment, buffer, att_size);
for (i = 0; i < MAX_ATTACHMENTS; i++) for (i = 0; i < MAX_ATTACHMENTS; i++)