Commit bd61d2eb9058ed973aef50c6f4c4d97de208f830
1 parent
73d63635
remove public from BufferedConnection
make actioner compatible with old application which use String as action name instead of new WEB_Action_Name
Showing
2 changed files
with
48 additions
and
2 deletions
Show diff stats
web/CXM_making_a_web_site.anubis
| @@ -1404,6 +1404,23 @@ public define HTML_In_Form | @@ -1404,6 +1404,23 @@ public define HTML_In_Form | ||
| 1404 | String name | 1404 | String name |
| 1405 | ) = | 1405 | ) = |
| 1406 | foreign_link([size(tsize)],url,name). | 1406 | foreign_link([size(tsize)],url,name). |
| 1407 | + | ||
| 1408 | +public define HTML_In_Form | ||
| 1409 | +/* Older call with String as action instead of WEB_Action_Name. | ||
| 1410 | + * This function exists only for compatibility with older project. | ||
| 1411 | + * Please condiser to use above function instead | ||
| 1412 | + */ | ||
| 1413 | + actioner | ||
| 1414 | + ( | ||
| 1415 | + Actioner_Connection conn, | ||
| 1416 | + Actioner_Target targ, | ||
| 1417 | + Actioner_Aspect asp, | ||
| 1418 | + String action, | ||
| 1419 | + List((String,String)) extra_ops, | ||
| 1420 | + List(Actioner_Local_Action) local_actions | ||
| 1421 | + )= | ||
| 1422 | + actioner(conn,targ,asp,action_name(action),extra_ops,local_actions) | ||
| 1423 | +. | ||
| 1407 | 1424 | ||
| 1408 | public define HTML_In_Form | 1425 | public define HTML_In_Form |
| 1409 | actioner | 1426 | actioner |
| @@ -1643,6 +1660,16 @@ public define HTML_Off_Form | @@ -1643,6 +1660,16 @@ public define HTML_Off_Form | ||
| 1643 | ) = | 1660 | ) = |
| 1644 | form(html_Id(form_name), options, action, extra_ops, content). | 1661 | form(html_Id(form_name), options, action, extra_ops, content). |
| 1645 | 1662 | ||
| 1663 | +public define HTML_Off_Form | ||
| 1664 | + form | ||
| 1665 | + ( | ||
| 1666 | + String form_name, | ||
| 1667 | + List(CoreAttrs) options, | ||
| 1668 | + String action, | ||
| 1669 | + List((String,String)) extra_ops, | ||
| 1670 | + HTML_In_Form content | ||
| 1671 | + ) = | ||
| 1672 | + form(html_Id(form_name), options, action_name(action), extra_ops, content). | ||
| 1646 | 1673 | ||
| 1647 | public define HTML_Off_Form literal(Printable_tree t) = literal_pt(t). | 1674 | public define HTML_Off_Form literal(Printable_tree t) = literal_pt(t). |
| 1648 | public define HTML_Off_Form fixed_size(HTML_Size width, HTML_Size height, String name_of_HTML_file) | 1675 | public define HTML_Off_Form fixed_size(HTML_Size width, HTML_Size height, String name_of_HTML_file) |
| @@ -1681,6 +1708,23 @@ public define HTML_Off_Form | @@ -1681,6 +1708,23 @@ public define HTML_Off_Form | ||
| 1681 | Actioner_Target targ, | 1708 | Actioner_Target targ, |
| 1682 | Actioner_Aspect asp, | 1709 | Actioner_Aspect asp, |
| 1683 | String action, | 1710 | String action, |
| 1711 | + List((String,String)) extra_ops, | ||
| 1712 | + List(Actioner_Local_Action) local_actions | ||
| 1713 | + )= | ||
| 1714 | + actioner(conn,targ,asp,action_name(action),extra_ops,local_actions) | ||
| 1715 | +. | ||
| 1716 | + | ||
| 1717 | +public define HTML_Off_Form | ||
| 1718 | +/* Older call with String as action instead of WEB_Action_Name. | ||
| 1719 | + * This function exists only for compatibility with older project. | ||
| 1720 | + * Please condiser to use above function instead | ||
| 1721 | + */ | ||
| 1722 | + actioner | ||
| 1723 | + ( | ||
| 1724 | + Actioner_Connection conn, | ||
| 1725 | + Actioner_Target targ, | ||
| 1726 | + Actioner_Aspect asp, | ||
| 1727 | + String action, | ||
| 1684 | List((String,String)) extra_ops | 1728 | List((String,String)) extra_ops |
| 1685 | )= | 1729 | )= |
| 1686 | actioner(conn,targ,asp,action_name(action),extra_ops,[]) | 1730 | actioner(conn,targ,asp,action_name(action),extra_ops,[]) |
web/CXM_multihost_http_server.anubis
| @@ -684,7 +684,8 @@ type EncodingType: | @@ -684,7 +684,8 @@ type EncodingType: | ||
| 684 | www_url, | 684 | www_url, |
| 685 | multipart_form_data. | 685 | multipart_form_data. |
| 686 | 686 | ||
| 687 | -public type BufferedConnection: | 687 | + |
| 688 | +type BufferedConnection: | ||
| 688 | buffered_connection(Connection conn, | 689 | buffered_connection(Connection conn, |
| 689 | Var(ByteArray) buffer, | 690 | Var(ByteArray) buffer, |
| 690 | Var(Int) read_pos, | 691 | Var(Int) read_pos, |
| @@ -692,13 +693,14 @@ public type BufferedConnection: | @@ -692,13 +693,14 @@ public type BufferedConnection: | ||
| 692 | ). | 693 | ). |
| 693 | 694 | ||
| 694 | 695 | ||
| 695 | -public define BufferedConnection | 696 | +define BufferedConnection |
| 696 | buffered_connection | 697 | buffered_connection |
| 697 | ( | 698 | ( |
| 698 | Connection conn | 699 | Connection conn |
| 699 | )= | 700 | )= |
| 700 | buffered_connection(conn, var(constant_byte_array(0, 0)), var(0), var([])) | 701 | buffered_connection(conn, var(constant_byte_array(0, 0)), var(0), var([])) |
| 701 | . | 702 | . |
| 703 | + | ||
| 702 | 704 | ||
| 703 | *** [2] Tools. | 705 | *** [2] Tools. |
| 704 | 706 |