Updated code, get rid of obsolete feature calls in libraries and examples
This commit is contained in:
@@ -205,7 +205,7 @@ feature {NONE} -- Implementation
|
||||
loop
|
||||
s.append (" - ")
|
||||
s.append (c.item.url_encoded_name)
|
||||
t := c.item.generating_type
|
||||
t := c.item.generating_type.name
|
||||
if t.same_string ("WSF_STRING") then
|
||||
else
|
||||
s.append_character (' ')
|
||||
|
||||
@@ -87,7 +87,7 @@ feature -- Access: order status
|
||||
end
|
||||
|
||||
Order_states : ARRAY [STRING]
|
||||
-- List of valid status states
|
||||
-- List of valid status states.
|
||||
once
|
||||
Result := <<
|
||||
status_unset,
|
||||
|
||||
@@ -27,7 +27,7 @@ feature -- Access
|
||||
end
|
||||
|
||||
Milk_types: ARRAY [STRING]
|
||||
-- List of valid Milk types
|
||||
-- List of valid Milk types.
|
||||
once
|
||||
Result := <<"skim", "semi", "whole">>
|
||||
end
|
||||
|
||||
@@ -334,7 +334,6 @@ feature {NONE} -- Conversion
|
||||
|
||||
order_to_json (obj: ORDER): JSON_OBJECT
|
||||
local
|
||||
j_order: JSON_OBJECT
|
||||
j_item: JSON_OBJECT
|
||||
ja: JSON_ARRAY
|
||||
do
|
||||
|
||||
@@ -12,8 +12,6 @@ inherit
|
||||
feature {NONE} -- Initialization
|
||||
|
||||
make (a_location: PATH)
|
||||
local
|
||||
d: DIRECTORY
|
||||
do
|
||||
location := a_location
|
||||
ensure_directory_exists (a_location)
|
||||
@@ -67,7 +65,6 @@ feature -- Access
|
||||
|
||||
save (a_entry_type: TYPE [detachable ANY]; a_entry: detachable ANY; cl_entry_id: CELL [detachable READABLE_STRING_GENERAL])
|
||||
local
|
||||
f: RAW_FILE
|
||||
l_id: detachable READABLE_STRING_GENERAL
|
||||
p: PATH
|
||||
do
|
||||
|
||||
@@ -54,7 +54,7 @@ feature -- Execution
|
||||
if attached {WSF_STRING} req.item ("user") as u then
|
||||
--| If yes, say hello world #name
|
||||
|
||||
l_user_name := (create {HTML_ENCODER}).decoded_string (u.value)
|
||||
l_user_name := (create {HTML_ENCODER}).decoded_string (u.value.to_string_8)
|
||||
|
||||
s := "<p>Hello " + mesg.html_encoded_string (l_user_name) + "!</p>"
|
||||
s.append ("Display a <a href=%"/users/" + u.url_encoded_value + "/message/%">message</a></p>")
|
||||
|
||||
@@ -86,7 +86,7 @@ feature -- Access
|
||||
html_decoded_string (v: READABLE_STRING_32): READABLE_STRING_32
|
||||
do
|
||||
if v.is_valid_as_string_8 then
|
||||
Result := (create {HTML_ENCODER}).decoded_string (v)
|
||||
Result := (create {HTML_ENCODER}).decoded_string (v.to_string_8)
|
||||
else
|
||||
Result := v
|
||||
end
|
||||
|
||||
@@ -501,7 +501,7 @@ feature -- Helper
|
||||
across
|
||||
lst as c
|
||||
loop
|
||||
Result.append (c.item.content)
|
||||
Result.append (c.item.content.to_string_8)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -92,7 +92,7 @@ feature -- Basic operation
|
||||
if attached item_by_name ("openid.claimed_id", q_lst) as q_claimed_id then
|
||||
l_claimed_id := q_claimed_id.as_string_8
|
||||
elseif attached item_by_name ("openid.identity", q_lst) as l_id then
|
||||
l_claimed_id := l_id
|
||||
l_claimed_id := l_id.to_string_8
|
||||
end
|
||||
identity := l_claimed_id
|
||||
tb.force (item_by_name ("openid.assoc_handle", q_lst), "openid.assoc_handle")
|
||||
@@ -117,7 +117,7 @@ feature -- Basic operation
|
||||
|
||||
if
|
||||
attached item_by_name ("openid.return_to", q_lst) as q_return_to and then
|
||||
not return_url.same_string (q_return_to)
|
||||
not return_url.same_string (q_return_to.to_string_8)
|
||||
then
|
||||
-- The return_to url must match the url of current request.
|
||||
-- I'm assuing that noone will set the returnUrl to something that doesn't make sense.
|
||||
@@ -235,8 +235,8 @@ feature -- Basic operation
|
||||
loop
|
||||
s := c.item
|
||||
if
|
||||
s.starts_with (k_value)
|
||||
or s.starts_with (k_type)
|
||||
s.starts_with (k_value.to_string_32)
|
||||
or s.starts_with (k_type.to_string_32)
|
||||
then
|
||||
ax_keys.force ("openid." + s)
|
||||
end
|
||||
@@ -251,7 +251,7 @@ feature -- Basic operation
|
||||
loop
|
||||
s := c.item
|
||||
if attached item_by_name (s, lst) as v then
|
||||
if s.starts_with (k_value) then
|
||||
if s.starts_with (k_value.to_string_32) then
|
||||
k := s.substring (k_value.count + 1, s.count)
|
||||
i := k.index_of ('.', 1)
|
||||
if i > 1 then
|
||||
|
||||
@@ -137,7 +137,7 @@ feature -- Status report
|
||||
-- String that should be displayed in debugger to represent `Current'.
|
||||
do
|
||||
create Result.make_empty
|
||||
Result.append (type)
|
||||
Result.append (type.to_string_32)
|
||||
Result.append (" ")
|
||||
if attached login as l_login then
|
||||
Result.append ("login=[")
|
||||
|
||||
@@ -94,7 +94,7 @@ feature {NONE} -- Implementation
|
||||
require
|
||||
a_value_not_is_empty: a_value /= Void
|
||||
do
|
||||
a_output.append (a_name)
|
||||
a_output.append (a_name.to_string_32)
|
||||
a_output.append_character ('=')
|
||||
a_output.append_string_general (a_value)
|
||||
a_output.append_character ('%N')
|
||||
@@ -103,7 +103,7 @@ feature {NONE} -- Implementation
|
||||
append_variable_to_debug_output (a_name: READABLE_STRING_8; a_value: detachable READABLE_STRING_GENERAL; a_output: STRING_32)
|
||||
do
|
||||
if a_value /= Void then
|
||||
a_output.append (a_name)
|
||||
a_output.append (a_name.to_string_32)
|
||||
a_output.append_character ('=')
|
||||
a_output.append_string_general (a_value)
|
||||
a_output.append_character ('%N')
|
||||
@@ -354,7 +354,7 @@ invariant
|
||||
request_method_set: not request_method.is_empty
|
||||
|
||||
note
|
||||
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -166,7 +166,7 @@ feature -- Basic Operation
|
||||
if is_verbose then
|
||||
log ("%NReceive <====================", debug_level)
|
||||
if attached req.raw_header_data as rhd then
|
||||
log (rhd, debug_level)
|
||||
log (rhd.to_string_8, debug_level)
|
||||
end
|
||||
end
|
||||
if
|
||||
@@ -189,7 +189,7 @@ feature -- Basic Operation
|
||||
end
|
||||
-- Sending the server's opening handshake
|
||||
create l_sha1.make
|
||||
l_sha1.update_from_string (l_ws_key + magic_guid)
|
||||
l_sha1.update_from_string (l_ws_key.to_string_8 + magic_guid)
|
||||
l_key := Base64_encoder.encoded_string (digest (l_sha1))
|
||||
res.header.add_header_key_value ("Upgrade", "websocket")
|
||||
res.header.add_header_key_value ("Connection", "Upgrade")
|
||||
@@ -795,7 +795,7 @@ feature {NONE} -- Debug
|
||||
|
||||
|
||||
note
|
||||
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -69,7 +69,7 @@ feature -- Basic operations
|
||||
s.append (c.item.url_encoded_name)
|
||||
s.append_character (' ')
|
||||
s.append_character ('{')
|
||||
s.append (c.item.generating_type)
|
||||
s.append (c.item.generating_type.name)
|
||||
s.append_character ('}')
|
||||
s.append_character ('=')
|
||||
s.append (c.item.debug_output.as_string_8)
|
||||
@@ -80,7 +80,7 @@ feature -- Basic operations
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
licensing_options: "http://www.eiffel.com/licensing"
|
||||
copying: "[
|
||||
|
||||
@@ -245,7 +245,7 @@ feature {NONE} -- Implementation
|
||||
s.append_character (' ')
|
||||
if attached c.item as l_item then
|
||||
s.append_character ('{')
|
||||
s.append (l_item.generating_type)
|
||||
s.append (l_item.generating_type.name)
|
||||
s.append_character ('}')
|
||||
|
||||
s.append_character (' ')
|
||||
@@ -316,7 +316,7 @@ feature {NONE} -- Implementation
|
||||
else
|
||||
a_output.append (c.item.url_encoded_name)
|
||||
end
|
||||
t := c.item.generating_type
|
||||
t := c.item.generating_type.name
|
||||
if t.same_string ("WSF_STRING") then
|
||||
else
|
||||
a_output.append_character (' ')
|
||||
@@ -420,7 +420,7 @@ feature -- Constants
|
||||
invariant
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -101,7 +101,7 @@ feature -- Basic operations
|
||||
-- also if-range when we add support for range requests
|
||||
if not l_if_match.same_string ("*") then
|
||||
l_etags := l_if_match.split (',')
|
||||
l_failed := not across l_etags as i_etags some a_handler.matching_etag (req, i_etags.item, True) end
|
||||
l_failed := not across l_etags as i_etags some a_handler.matching_etag (req, i_etags.item.to_string_32, True) end
|
||||
end
|
||||
end
|
||||
if l_failed then
|
||||
@@ -122,7 +122,7 @@ feature -- Basic operations
|
||||
if attached req.http_if_none_match as l_if_none_match then
|
||||
l_etags := l_if_none_match.split (',')
|
||||
l_failed := l_if_none_match.same_string ("*") or
|
||||
across l_etags as i_etags some a_handler.matching_etag (req, i_etags.item, False) end
|
||||
across l_etags as i_etags some a_handler.matching_etag (req, i_etags.item.to_string_32, False) end
|
||||
end
|
||||
if l_failed then
|
||||
handle_if_none_match_failed (req, res, a_handler)
|
||||
@@ -408,7 +408,7 @@ feature -- Error reporting
|
||||
if req.is_content_type_accepted ({HTTP_MIME_TYPES}.text_html) then
|
||||
s := "<html lang=%"en%"><head>"
|
||||
s.append ("<title>")
|
||||
s.append (html_encoder.encoded_string (req.request_uri))
|
||||
s.append (html_encoder.encoded_string (req.request_uri.to_string_32))
|
||||
s.append ("Error " + a_status_code.out + " (" + l_msg + ")")
|
||||
s.append ("</title>%N")
|
||||
s.append ("[
|
||||
@@ -434,7 +434,7 @@ feature -- Error reporting
|
||||
s.append ("</div>")
|
||||
s.append ("The current location for this resource is <a href=%"" + a_locations.first.string + "%">here</a>")
|
||||
s.append ("Error " + a_status_code.out + " (" + l_msg + ")</div>")
|
||||
s.append ("<div id=%"message%">Error " + a_status_code.out + " (" + l_msg + "): <code>" + html_encoder.encoded_string (req.request_uri) + "</code></div>")
|
||||
s.append ("<div id=%"message%">Error " + a_status_code.out + " (" + l_msg + "): <code>" + html_encoder.encoded_string (req.request_uri.to_string_32) + "</code></div>")
|
||||
s.append ("<div id=%"footer%"></div>")
|
||||
s.append ("</body>%N")
|
||||
s.append ("</html>%N")
|
||||
@@ -587,7 +587,7 @@ feature -- Error reporting
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2014, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
copyright: "2011-2017, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -148,7 +148,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
end
|
||||
|
||||
if doc_url_supported and then attached {WSF_STRING} request.query_parameter ("api") as l_api then
|
||||
l_api_resource := l_api.value
|
||||
l_api_resource := l_api.value.to_string_8
|
||||
if l_api_resource.is_empty then
|
||||
l_api_resource := Void
|
||||
end
|
||||
@@ -324,7 +324,7 @@ feature {NONE} -- Implementation
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -214,7 +214,7 @@ feature -- Execution
|
||||
if f.is_readable then
|
||||
if f.is_directory then
|
||||
if index_disabled then
|
||||
process_directory_index_disabled (uri, req, res)
|
||||
process_directory_index_disabled (uri.to_string_8, req, res)
|
||||
else
|
||||
process_index (req.request_uri, fn, req, res)
|
||||
end
|
||||
@@ -222,10 +222,10 @@ feature -- Execution
|
||||
process_file (f, req, res)
|
||||
end
|
||||
else
|
||||
process_access_denied (uri, req, res)
|
||||
process_access_denied (uri.to_string_8, req, res)
|
||||
end
|
||||
else
|
||||
process_not_found (uri, req, res)
|
||||
process_not_found (uri.to_string_8, req, res)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -344,7 +344,7 @@ feature -- Execution
|
||||
do
|
||||
if
|
||||
attached req.meta_string_variable ("HTTP_IF_MODIFIED_SINCE") as s_if_modified_since and then
|
||||
attached http_date_format_to_date (s_if_modified_since) as l_if_modified_since_date and then
|
||||
attached http_date_format_to_date (s_if_modified_since.to_string_8) as l_if_modified_since_date and then
|
||||
attached file_date (f) as f_date and then
|
||||
f_date <= l_if_modified_since_date
|
||||
then
|
||||
|
||||
@@ -45,7 +45,7 @@ feature -- Status report
|
||||
across
|
||||
mtds as c
|
||||
loop
|
||||
s.append_string (c.item)
|
||||
s.append_string (c.item.to_string_32)
|
||||
s.append_string (" ")
|
||||
end
|
||||
s.append_string ("]")
|
||||
@@ -65,7 +65,7 @@ invariant
|
||||
mapping_attached: mapping /= Void
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -32,8 +32,8 @@ feature {NONE} -- Initialization
|
||||
elseif attached {WSF_STRING} req.query_parameter (cookie_name) as q_uuid then
|
||||
l_uuid := q_uuid.value
|
||||
end
|
||||
if l_uuid /= Void and then session_exists (l_uuid) then
|
||||
uuid := l_uuid
|
||||
if l_uuid /= Void and then session_exists (l_uuid.to_string_8) then
|
||||
uuid := l_uuid.to_string_8
|
||||
load
|
||||
else
|
||||
is_pending := True
|
||||
@@ -183,7 +183,7 @@ feature {NONE} -- Implementation
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -57,7 +57,7 @@ feature -- Query
|
||||
-- if possible
|
||||
do
|
||||
if attached value as v then
|
||||
Result := v.generating_type
|
||||
Result := v.generating_type.name_32
|
||||
else
|
||||
Result := "Void"
|
||||
end
|
||||
@@ -71,7 +71,7 @@ feature -- Visitor
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -132,10 +132,10 @@ feature -- Helper
|
||||
v: like value
|
||||
do
|
||||
v := value
|
||||
if v = a_other then
|
||||
if v = a_other.to_string_32 then
|
||||
Result := True
|
||||
elseif v.is_valid_as_string_8 then
|
||||
Result := v.is_case_insensitive_equal (a_other)
|
||||
Result := v.is_case_insensitive_equal (a_other.to_string_32)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -154,7 +154,7 @@ feature -- Visitor
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -83,7 +83,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
else
|
||||
--| Other response codes are possible, such as 301 Moved permananently,
|
||||
--| 302 Found and 410 Gone. But these require handlers to implement,
|
||||
--| so no other code can be given at this point.
|
||||
--| so no other code can be given at this point.
|
||||
msg := not_found_message (req)
|
||||
end
|
||||
res.send (msg)
|
||||
@@ -98,7 +98,7 @@ feature {NONE} -- Implementation
|
||||
do
|
||||
create Result.make (req)
|
||||
end
|
||||
|
||||
|
||||
method_not_allowed_message (req: WSF_REQUEST): detachable WSF_METHOD_NOT_ALLOWED_RESPONSE
|
||||
require
|
||||
req_attached: req /= Void
|
||||
@@ -125,13 +125,13 @@ feature {NONE} -- Implementation
|
||||
l_is_hidden := l_doc_mapping.documentation (i.request_methods).is_hidden
|
||||
end
|
||||
if not l_is_hidden then
|
||||
create s.make_from_string (i.mapping.associated_resource)
|
||||
create s.make_from_string (i.mapping.associated_resource.to_string_32)
|
||||
if attached i.request_methods as mtds then
|
||||
s.append (" [ ")
|
||||
across
|
||||
mtds as mtds_c
|
||||
loop
|
||||
s.append (mtds_c.item)
|
||||
s.append (mtds_c.item.to_string_32)
|
||||
s.append_character (' ')
|
||||
end
|
||||
s.append ("]")
|
||||
@@ -169,7 +169,7 @@ feature {NONE} -- Implementation
|
||||
end
|
||||
if not l_is_hidden then
|
||||
ok := True
|
||||
create s.make_from_string (i.mapping.associated_resource)
|
||||
create s.make_from_string (i.mapping.associated_resource.to_string_32)
|
||||
if attached i.request_methods as mtds then
|
||||
ok := False
|
||||
s.append (" [ ")
|
||||
@@ -179,7 +179,7 @@ feature {NONE} -- Implementation
|
||||
if m = Void or else m.is_case_insensitive_equal (c.item) then
|
||||
ok := True
|
||||
end
|
||||
s.append (c.item)
|
||||
s.append (c.item.to_string_32)
|
||||
s.append_character (' ')
|
||||
end
|
||||
s.append ("]")
|
||||
@@ -196,7 +196,7 @@ feature {NONE} -- Implementation
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -101,9 +101,9 @@ feature {WSF_RESPONSE} -- Output
|
||||
do
|
||||
create l_messages
|
||||
h := header
|
||||
if
|
||||
not attached recognized_methods as l_recognized_methods
|
||||
or else l_recognized_methods.has (request.request_method.as_upper)
|
||||
if
|
||||
not attached recognized_methods as l_recognized_methods
|
||||
or else l_recognized_methods.has (request.request_method.as_upper)
|
||||
then
|
||||
res.set_status_code (l_messages.method_not_allowed)
|
||||
else
|
||||
@@ -130,7 +130,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
if request.is_content_type_accepted ({HTTP_MIME_TYPES}.text_html) then
|
||||
s := "<html lang=%"en%"><head>"
|
||||
s.append ("<title>")
|
||||
s.append (html_encoder.encoded_string (request.request_uri))
|
||||
s.append (html_encoder.encoded_string (request.request_uri.to_string_32))
|
||||
s.append (l_html_error_code_text + "!!")
|
||||
s.append ("</title>%N")
|
||||
s.append (
|
||||
@@ -160,7 +160,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
s.append (l_html_error_code_text + "</div>")
|
||||
s.append ("<div id=%"message%">" + l_html_error_code_text + ": the request method <code>")
|
||||
s.append (request.request_method)
|
||||
s.append ("</code> is inappropriate for the URL for <code>" + html_encoder.encoded_string (request.request_uri) + "</code>.</div>")
|
||||
s.append ("</code> is inappropriate for the URL for <code>" + html_encoder.encoded_string (request.request_uri.to_string_32) + "</code>.</div>")
|
||||
if attached suggested_methods as lst and then not lst.is_empty then
|
||||
s.append ("<div id=%"suggestions%"><strong>Allowed methods:</strong>")
|
||||
across
|
||||
@@ -221,7 +221,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
else
|
||||
s := l_html_error_code_text + ": the request method "
|
||||
s.append (request.request_method)
|
||||
s.append (" is inappropriate for the URL for '" + html_encoder.encoded_string (request.request_uri) + "'.%N")
|
||||
s.append (" is inappropriate for the URL for '" + html_encoder.encoded_string (request.request_uri.to_string_32) + "'.%N")
|
||||
if attached suggested_methods as lst and then not lst.is_empty then
|
||||
s.append ("Allowed methods:")
|
||||
across
|
||||
@@ -327,7 +327,7 @@ feature {NONE} -- Implementation
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -76,7 +76,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
if request.is_content_type_accepted ({HTTP_MIME_TYPES}.text_html) then
|
||||
s := "<html lang=%"en%"><head>"
|
||||
s.append ("<title>")
|
||||
s.append (html_encoder.encoded_string (request.request_uri))
|
||||
s.append (html_encoder.encoded_string (request.request_uri.to_string_32))
|
||||
s.append ("Error 404 (Not Found)")
|
||||
s.append ("</title>%N")
|
||||
s.append ("[
|
||||
@@ -101,7 +101,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
s.append ("<div class=%"inner2%"></div>")
|
||||
s.append ("</div>")
|
||||
s.append ("Error 404 (Not Found)</div>")
|
||||
s.append ("<div id=%"message%">Error 404 (Not Found): <code>" + html_encoder.encoded_string (request.request_uri) + "</code></div>")
|
||||
s.append ("<div id=%"message%">Error 404 (Not Found): <code>" + html_encoder.encoded_string (request.request_uri.to_string_32) + "</code></div>")
|
||||
if attached suggested_items as lst and then not lst.is_empty then
|
||||
s.append ("<div id=%"suggestions%"><strong>Perhaps you are looking for:</strong><ul>")
|
||||
from
|
||||
@@ -198,7 +198,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -61,7 +61,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
if request.is_content_type_accepted ({HTTP_MIME_TYPES}.text_html) then
|
||||
s := "<html lang=%"en%"><head>"
|
||||
s.append ("<title>")
|
||||
s.append (html_encoder.encoded_string (request.request_uri))
|
||||
s.append (html_encoder.encoded_string (request.request_uri.to_string_32))
|
||||
s.append ("Error 412 (Precondition Failed)")
|
||||
s.append ("</title>%N")
|
||||
s.append ("[
|
||||
@@ -84,7 +84,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
s.append ("<div class=%"inner2%"></div>")
|
||||
s.append ("</div>")
|
||||
s.append ("Error 412 (Precondition Failed)</div>")
|
||||
s.append ("<div id=%"message%">Error 412 (Precondition Failed): <code>" + html_encoder.encoded_string (request.request_uri) + "</code></div>")
|
||||
s.append ("<div id=%"message%">Error 412 (Precondition Failed): <code>" + html_encoder.encoded_string (request.request_uri.to_string_32) + "</code></div>")
|
||||
if attached body as b then
|
||||
s.append ("<div>")
|
||||
s.append (b)
|
||||
@@ -116,7 +116,7 @@ feature {WSF_RESPONSE} -- Output
|
||||
|
||||
note
|
||||
|
||||
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -691,7 +691,7 @@ feature -- Access: CGI Meta variables
|
||||
do
|
||||
meta_variables_table.force (new_string_value (a_name, a_value), a_name)
|
||||
ensure
|
||||
param_set: attached {WSF_STRING} meta_variable (a_name) as val and then val.url_encoded_value.same_string (a_value)
|
||||
param_set: attached {WSF_STRING} meta_variable (a_name) as val and then val.url_encoded_value.same_string (a_value.to_string_8)
|
||||
end
|
||||
|
||||
unset_meta_variable (a_name: READABLE_STRING_GENERAL)
|
||||
@@ -842,7 +842,7 @@ feature -- Access: CGI meta parameters - 1.1
|
||||
if pi.is_empty then
|
||||
l_result := ""
|
||||
elseif pi.count = 1 and then pi[1] = '/' then
|
||||
l_result := "/"
|
||||
l_result := "/"
|
||||
else
|
||||
r := request_uri
|
||||
i := r.index_of ('?', 1)
|
||||
@@ -2110,7 +2110,7 @@ invariant
|
||||
wgi_request.content_type /= Void implies content_type /= Void
|
||||
|
||||
note
|
||||
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -42,7 +42,7 @@ feature -- Element change
|
||||
across
|
||||
options as o
|
||||
loop
|
||||
if o.item.is_same_value (v) then
|
||||
if o.item.is_same_value (v.to_string_32) then
|
||||
l_found := True
|
||||
o.item.set_is_selected (True)
|
||||
else
|
||||
@@ -50,7 +50,7 @@ feature -- Element change
|
||||
end
|
||||
end
|
||||
if not l_found then
|
||||
create opt.make (v, Void)
|
||||
create opt.make (v.to_string_32, Void)
|
||||
opt.set_is_selected (True)
|
||||
add_option (opt)
|
||||
end
|
||||
|
||||
@@ -20,7 +20,7 @@ feature {NONE} -- Initialization
|
||||
do
|
||||
value := a_value
|
||||
if a_text = Void then
|
||||
text := a_value
|
||||
text := a_value.to_string_8
|
||||
else
|
||||
text := a_text
|
||||
end
|
||||
|
||||
@@ -110,26 +110,26 @@ feature {NONE} -- Conversion
|
||||
--formaction
|
||||
if attached formaction as l_formaction then
|
||||
a_target.append (" formaction=%"")
|
||||
a_target.append (l_formaction)
|
||||
a_target.append (l_formaction.to_string_8)
|
||||
a_target.append_character ('%"')
|
||||
end
|
||||
--formenctype
|
||||
if attached formenctype as l_enctype then
|
||||
a_target.append (" formenctype=%"")
|
||||
a_target.append (l_enctype)
|
||||
a_target.append (l_enctype.to_string_8)
|
||||
a_target.append_character ('%"')
|
||||
end
|
||||
-- formmethod
|
||||
if attached formmethod as l_method then
|
||||
a_target.append (" formmethod=%"")
|
||||
a_target.append (l_method)
|
||||
a_target.append (l_method.to_string_8)
|
||||
a_target.append_character ('%"')
|
||||
end
|
||||
|
||||
-- formmethod
|
||||
if attached formtarget as l_target then
|
||||
a_target.append (" formtarget=%"")
|
||||
a_target.append (l_target)
|
||||
a_target.append (l_target.to_string_8)
|
||||
a_target.append_character ('%"')
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user