2016-08-03 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in rdlibrary(1) that caused exports to contain incorrect
	marker data in the RDXL file structure.
This commit is contained in:
Fred Gleason
2016-08-03 12:21:05 -04:00
parent d232842b0c
commit 51cdcfb9be
9 changed files with 87 additions and 38 deletions

View File

@@ -104,7 +104,7 @@ void Xport::AddCart()
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartAdd>\n");
if(cart->exists()) {
printf("%s",(const char *)cart->xml(false));
printf("%s",(const char *)cart->xml(false,true));
}
delete cart;
printf("</cartAdd>\n");
@@ -173,7 +173,7 @@ void Xport::ListCarts()
printf("<cartList>\n");
while(q->next()) {
cart=new RDCart(q->value(0).toUInt());
printf("%s",(const char *)cart->xml(include_cuts));
printf("%s",(const char *)cart->xml(include_cuts,true));
delete cart;
}
printf("</cartList>\n");
@@ -215,7 +215,7 @@ void Xport::ListCart()
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartList>\n");
cart=new RDCart(cart_number);
printf("%s",(const char *)cart->xml(include_cuts));
printf("%s",(const char *)cart->xml(include_cuts,true));
delete cart;
printf("</cartList>\n");
@@ -390,7 +390,7 @@ void Xport::EditCart()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cartList>\n");
printf("%s",(const char *)cart->xml(include_cuts));
printf("%s",(const char *)cart->xml(include_cuts,true));
delete cart;
printf("</cartList>\n");
@@ -479,7 +479,7 @@ void Xport::AddCut()
printf("<cutAdd>\n");
cut=new RDCut(cart_number,cut_number);
if(cut->exists()) {
printf("%s",(const char *)cut->xml());
printf("%s",(const char *)cut->xml(true));
}
delete cut;
delete cart;
@@ -524,7 +524,7 @@ void Xport::ListCuts()
while(q->next()) {
cut=new RDCut(q->value(0).toString());
if(cut->exists()) {
printf("%s",(const char *)cut->xml());
printf("%s",(const char *)cut->xml(true));
}
delete cut;
}
@@ -570,7 +570,7 @@ void Xport::ListCut()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cutList>\n");
printf("%s",(const char *)cut->xml());
printf("%s",(const char *)cut->xml(true));
printf("</cutList>\n");
delete cut;
@@ -843,7 +843,7 @@ void Xport::EditCut()
printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
printf("<cutList>\n");
printf("%s",(const char *)cut->xml());
printf("%s",(const char *)cut->xml(true));
printf("</cutList>\n");
delete cut;

View File

@@ -127,7 +127,7 @@ void Xport::Export()
if(cart->enforceLength()) {
speed_ratio=(float)cut->length()/(float)cart->forcedLength();
}
rdxl=cart->xml(true,settings,cutnum);
rdxl=cart->xml(true,start_point<0,settings,cutnum);
delete cut;
delete cart;
}