ELOG/elog
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with attributes containing spaces

Browse Source 
SVN revision: 855
This commit is contained in:
ritt
2004-03-25 19:47:48 +00:00
parent 428b5213c2
commit 9e1ea300b3
2 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/elog.c
+24 -6
View File
@@ -6,6 +6,9 @@
Contents: Electronic logbook utility
$Log$
Revision 1.18 2004/03/25 19:47:48 midas
Fixed problem with attributes containing spaces
Revision 1.17 2004/03/14 16:43:29 midas
Implemented option 'guest display'
@@ -240,6 +243,18 @@ size_t strlcat(char *dst, const char *src, size_t size)
return (dlen + (s - src)); /* count does not include NUL */
}
/*-------------------------------------------------------------------*/
void btou(char *str)
/* convert all blanks to underscores in a string */
{
int i;
for (i = 0; i < (int) strlen(str); i++)
if (str[i] == ' ')
str[i] = '_';
}
/*------------------------------------------------------------------*/
void sgets(char *string, int size)
@@ -764,10 +779,13 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment,
"%s\r\nContent-Disposition: form-data; name=\"suppress\"\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]);
btou(str);
sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n", boundary,
attrib_name[i], attrib[i]);
str, attrib[i]);
}
sprintf(content + strlen(content),
"%s\r\nContent-Disposition: form-data; name=\"Text\"\r\n\r\n%s\r\n%s\r\n",
@@ -912,8 +930,8 @@ int main(int argc, char *argv[])
char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
text[0] = textfile[0] = uname[0] = upwd[0] = suppress = 0;
host_name[0] = logbook[0] = password[0] = subdir[0] = n_att = n_attr = reply = edit =
0;
host_name[0] = logbook[0] = password[0] = subdir[0] = 0;
n_att = n_attr = reply = edit = 0;
port = 80;
for (i = 0; i < MAX_ATTACHMENTS; i++) {
@@ -966,7 +984,7 @@ int main(int argc, char *argv[])
else if (argv[i][1] == 'm')
strcpy(textfile, argv[++i]);
else {
usage:
usage:
printf("\nusage: elog\n");
printf(" -h <hostname> [-p port] [-s subdir]\n");
printf
@@ -1058,7 +1076,7 @@ int main(int argc, char *argv[])
text[n - 1] = 0;
}
/*---- open attachment file ----*/
/*---- open attachment file ----*/
for (i = 0; i < MAX_ATTACHMENTS; i++) {
if (!attachment[i][0])
src/elogd.c
+19 -15
View File
@@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG
$Log$
Revision 1.313 2004/03/25 19:47:48 midas
Fixed problem with attributes containing spaces
Revision 1.312 2004/03/24 20:44:21 midas
Improved synchronization speed
@@ -7547,15 +7550,13 @@ void show_find_form(LOGBOOK * lbs)
rsprintf("<input type=radio id=\"CSV1\" name=\"mode\" value=\"CSV1\" checked>");
else
rsprintf("<input type=radio id=\"CSV1\" name=\"mode\" value=\"CSV1\">");
rsprintf("<label for=\"CSV1\">%s&nbsp;&nbsp;</label>\n",
loc("CSV (\",\" separated)"));
rsprintf("<label for=\"CSV1\">%s&nbsp;&nbsp;</label>\n", loc("CSV (\",\" separated)"));
if (strieq(mode, "CSV2"))
rsprintf("<input type=radio id=\"CSV2\" name=\"mode\" value=\"CSV2\" checked>");
else
rsprintf("<input type=radio id=\"CSV2\" name=\"mode\" value=\"CSV2\">");
rsprintf("<label for=\"CSV2\">%s&nbsp;&nbsp;</label>\n",
loc("CSV (\";\" separated)"));
rsprintf("<label for=\"CSV2\">%s&nbsp;&nbsp;</label>\n", loc("CSV (\";\" separated)"));
if (strieq(mode, "XML"))
rsprintf("<input type=radio id=\"XML\" name=\"mode\" value=\"XML\" checked>");
@@ -9103,7 +9104,7 @@ void csv_import(LOGBOOK * lbs, char *csv, char *csvfile)
if (strieq(sep, "auto")) {
/* count commas */
for (i=0,p=csv ; p ; i++) {
for (i = 0, p = csv; p; i++) {
p = strchr(p, ',');
if (p)
p++;
@@ -9111,7 +9112,7 @@ void csv_import(LOGBOOK * lbs, char *csv, char *csvfile)
n = i;
/* count semicolon */
for (i=0,p=csv ; p ; i++) {
for (i = 0, p = csv; p; i++) {
p = strchr(p, ';');
if (p)
p++;
@@ -10424,10 +10425,10 @@ void synchronize_logbook(LOGBOOK * lbs, BOOL bcron)
logf(lbs, "MIRROR conflict entry #%d", message_id);
combine_url(lbs, list[index], "", str, sizeof(str));
if (getcfg_topgroup())
sprintf(loc_ref, "<a href=\"../%s/%d\">%s</a>", lbs->name_enc,
message_id, loc("local"));
sprintf(loc_ref, "<a href=\"../%s/%d\">%s</a>", lbs->name_enc,
message_id, loc("local"));
else
sprintf(loc_ref, "<a href=\"%d\">%s</a>", message_id, loc("local"));
@@ -11068,21 +11069,24 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
rsputs(attrib[i]);
else {
rsprintf("<a href=\"%s\">", ref);
sprintf(str, "Display %s", attr_list[i]);
if (getcfg(lbs->name, str, display)) {
j = build_subst_list(lbs, (char (*)[NAME_LENGTH]) slist,
(char (*)[NAME_LENGTH]) svalue, attrib, TRUE);
(char (*)[NAME_LENGTH]) svalue, attrib,
TRUE);
sprintf(str, "%d", message_id);
add_subst_list((char (*)[NAME_LENGTH]) slist,
(char (*)[NAME_LENGTH]) svalue, "message id", str, &j);
(char (*)[NAME_LENGTH]) svalue, "message id",
str, &j);
add_subst_time(lbs, (char (*)[NAME_LENGTH]) slist,
(char (*)[NAME_LENGTH]) svalue, "entry time", date, &j);
(char (*)[NAME_LENGTH]) svalue, "entry time",
date, &j);
strsubst(display, (char (*)[NAME_LENGTH]) slist,
(char (*)[NAME_LENGTH]) svalue, j);
} else
} else
strcpy(display, attrib[i]);
if (is_html(display))
@@ -15059,7 +15063,7 @@ void show_elog_message(LOGBOOK * lbs, char *dec_path, char *command)
strsubst(display, (char (*)[NAME_LENGTH]) slist,
(char (*)[NAME_LENGTH]) svalue, j);
} else
} else
strcpy(display, attrib[i]);
if (is_html(display))