2018-09-10 Fred Gleason <fredg@paravelsystems.com>

* Fixed bugs in the 'rivwebcapi' rd_savelog(7) call that caused
	log saves to fail.
This commit is contained in:
Fred Gleason
2018-09-10 09:13:15 -04:00
parent 18abbd0d0b
commit f13aa1e3ae
10 changed files with 107 additions and 38 deletions

View File

@@ -67,7 +67,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
&last,
CURLFORM_PTRNAME,
"COMMAND",
CURLFORM_COPYCONTENTS,
CURLFORM_PTRCONTENTS,
"28",
CURLFORM_END);
@@ -95,6 +95,14 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
ticket,
CURLFORM_END);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
"LOG_NAME",
CURLFORM_COPYCONTENTS,
logname,
CURLFORM_END);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
@@ -164,7 +172,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_id);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -174,7 +182,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_type);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -184,7 +192,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_cart_number);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -194,7 +202,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_starttime);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -204,7 +212,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_gracetime);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -214,7 +222,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_time_type);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -236,7 +244,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
}
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -246,7 +254,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_start_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -256,7 +264,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_end_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -266,7 +274,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_segue_start_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -276,7 +284,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_segue_end_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -286,7 +294,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_fadeup_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -296,7 +304,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_fadeup_gain);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -306,7 +314,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_fadedown_point_log);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -316,7 +324,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_fadedown_gain);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -326,7 +334,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_duckup_gain);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -336,7 +344,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%d",linevals[i].logline_duckdown_gain);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -345,7 +353,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_COMMENT",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_marker_comment,
@@ -354,7 +362,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_LABEL",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_marker_label,
@@ -363,7 +371,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_ORIGIN_USER",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_origin_user,
@@ -373,7 +381,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
RD_Cnv_tm_to_DTString(&linevals[i].logline_origin_datetime,dtstr);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
dtstr,
@@ -383,7 +391,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_event_length);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -392,7 +400,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_LINK_EVENT_NAME",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_link_event_name,
@@ -402,7 +410,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_link_length);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -412,7 +420,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
RD_Cnv_tm_to_DTString(&linevals[i].logline_link_starttime,dtstr);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
dtstr,
@@ -422,7 +430,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_link_start_slop);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -432,7 +440,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_link_end_slop);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -442,7 +450,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_link_id);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -452,7 +460,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_link_embedded);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -462,7 +470,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
RD_Cnv_tm_to_DTString(&linevals[i].logline_ext_starttime,dtstr);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
dtstr,
@@ -472,7 +480,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(buffer,1024,"%u",linevals[i].logline_ext_length);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
buffer,
@@ -481,7 +489,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_EXT_CART_NAME",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_ext_cart_name,
@@ -490,7 +498,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_EXT_DATA",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_ext_data,
@@ -499,7 +507,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_EXT_EVENT_ID",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_ext_event_id,
@@ -508,7 +516,7 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
snprintf(str,1024,"LINE%u_EXT_ANNC_TYPE",i);
curl_formadd(&first,
&last,
CURLFORM_PTRNAME,
CURLFORM_COPYNAME,
str,
CURLFORM_COPYCONTENTS,
linevals[i].logline_ext_annc_type,