rwdruby 1.07 → 1.08
Sign up to get free protection for your applications and to get access to all the features.
- data/code/01rwdcore/02helptexthashbegin.rb +10 -0
- data/code/01rwdcore/03helptexthash.rb +18 -20
- data/code/01rwdcore/runopentinkerdocument.rb +1 -1
- data/code/superant.com.rwdshell/0uninstallapplet.rb +1 -1
- data/code/superant.com.rwdshell/loadconfigurationrecord.rb +1 -1
- data/code/superant.com.rwdshell/loadconfigurationvariables.rb +1 -1
- data/code/superant.com.rwdshell/saveconfigurationrecord.rb +1 -1
- data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb +62 -132
- data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb +9 -7
- data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb +6 -6
- data/code/superant.com.rwdtinkerbackwindow/viewlogfile.rb +13 -0
- data/configuration/rwdtinker.dist +3 -3
- data/configuration/{rwdwruby-1.07.dist → rwdwruby.dist} +2 -2
- data/configuration/tinkerwin2variables.dist +7 -2
- data/gui/tinkerbackwindows/superant.com.tinkerbackwindow/75rwdlogfile.rwd +20 -0
- data/init.rb +59 -163
- data/installed/{rwdwruby-1.07.inf → rwdwruby.inf} +3 -3
- data/lang/en/rwdcore/en.po +166 -0
- data/lang/es/rwdcore/es.po +172 -0
- data/lang/fr/rwdcore/fr.po +166 -0
- data/lang/hi/rwdcore/hi.po +170 -0
- data/lang/ja/rwdcore/ja.po +168 -0
- data/lang/nl/rwdcore/nl.po +166 -0
- data/lib/rwd/net.rb +8 -7
- data/lib/rwd/rwd.rb +34 -31
- data/lib/rwdthemes/default.rwd +1 -1
- data/lib/rwdtinker/rwdcodedir.rb +56 -0
- data/lib/rwdtinker/rwdguidir.rb +57 -0
- data/lib/rwdtinker/rwdlangdir.rb +60 -0
- data/lib/rwdtinker/rwdtinkertools.rb +25 -0
- data/rwd_files/HowTo_Tinker.txt +26 -7
- data/rwd_files/Tinkerhelptexthash.txt +81 -0
- data/rwd_files/log/rwdtinker.log +1841 -0
- data/tests/makedist-rwdwruby.rb +2 -2
- data/tests/makedist-tinkerbellw.rb +58 -0
- data/tests/makedist.rb +2 -2
- data/zips/{rwdwcalc-0.62.zip → rwdwcalc-0.63.zip} +0 -0
- data/zips/{rwdwfoldeditor-0.04.zip → rwdwfoldeditor-0.05.zip} +0 -0
- data/zips/rwdwhypernote-0.15.zip +0 -0
- data/zips/rwdwmovies-0.98.zip +0 -0
- data/zips/{rwdwruby-1.07.zip → rwdwruby-1.08.zip} +0 -0
- data/zips/tinkerbellw-0.03.zip +0 -0
- data/zips/wrubyslippers-1.08.zip +0 -0
- metadata +26 -19
- data/code/01rwdcore/04helptextend.rb +0 -6
- data/code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb +0 -61
- data/configuration/language.dist +0 -8
- data/configuration/rwdapplicationidentity.dist +0 -3
- data/lang/en/rwdcore/languagefile.rb +0 -58
- data/lang/es/rwdcore/languagefile-es.rb +0 -62
- data/lang/fr/rwdcore/languagefile.rb +0 -64
- data/lang/jp/rwdcore/languagefile.rb +0 -72
- data/lang/nl/rwdcore/languagefile.rb +0 -75
- data/zips/rwdwaddresses-1.06.zip +0 -0
- data/zips/rwdwgutenberg-0.09.zip +0 -0
- data/zips/wrubyslippers-1.06.zip +0 -0
@@ -0,0 +1,168 @@
|
|
1
|
+
# English Language files for RwdTinker core
|
2
|
+
|
3
|
+
msgid "applet_installed"
|
4
|
+
msgstr ""
|
5
|
+
|
6
|
+
msgid "application_version"
|
7
|
+
msgstr "アプリケーションのバージョン"
|
8
|
+
|
9
|
+
msgid "cancel"
|
10
|
+
msgstr "とりけし"
|
11
|
+
|
12
|
+
msgid "clickfor_version"
|
13
|
+
msgstr "バージョンをクリックして"
|
14
|
+
|
15
|
+
|
16
|
+
msgid "clickbelowtoviewlistof_zip"
|
17
|
+
msgstr ""
|
18
|
+
|
19
|
+
|
20
|
+
msgid "documents"
|
21
|
+
msgstr "ドキュメント"
|
22
|
+
|
23
|
+
msgid "edit"
|
24
|
+
msgstr "しゅうろく"
|
25
|
+
|
26
|
+
msgid "file_name"
|
27
|
+
msgstr "ファイル名"
|
28
|
+
|
29
|
+
msgid "fill_record"
|
30
|
+
msgstr ""
|
31
|
+
|
32
|
+
msgid "help"
|
33
|
+
msgstr "ヘルプ"
|
34
|
+
|
35
|
+
msgid "help_about"
|
36
|
+
msgstr "約ヘルプ"
|
37
|
+
|
38
|
+
msgid "install_applet"
|
39
|
+
msgstr "インストール (rwdtinker) アプレット"
|
40
|
+
|
41
|
+
msgid "jumptoapplication_location"
|
42
|
+
msgstr "Jump to Application Location"
|
43
|
+
|
44
|
+
msgid "list_applets"
|
45
|
+
msgstr "アプレットを削除"
|
46
|
+
|
47
|
+
msgid "listappletsinthegem_directory"
|
48
|
+
msgstr "リストアプレット で Gem ディレクトリ"
|
49
|
+
|
50
|
+
msgid "listappletsavailablefor_installation"
|
51
|
+
msgstr "一覧アプレットインストールが可能"
|
52
|
+
|
53
|
+
msgid "list_files"
|
54
|
+
msgstr "リストファイル"
|
55
|
+
|
56
|
+
msgid "list_installed_gems "
|
57
|
+
msgstr "かきつらねる"
|
58
|
+
|
59
|
+
msgid "list_photos"
|
60
|
+
msgstr "写真一覧"
|
61
|
+
|
62
|
+
msgid "list_zips"
|
63
|
+
msgstr "zipファイル一覧"
|
64
|
+
|
65
|
+
msgid "listzipdirappletsavailable"
|
66
|
+
msgstr "一覧 (zip directory) アプレットのインストールが可能"
|
67
|
+
|
68
|
+
msgid "menu_panel"
|
69
|
+
msgstr "メニュー画面"
|
70
|
+
|
71
|
+
msgid "module_unknown"
|
72
|
+
msgstr "未知のモジュール"
|
73
|
+
|
74
|
+
msgid "next"
|
75
|
+
msgstr "次の"
|
76
|
+
|
77
|
+
msgid "open"
|
78
|
+
msgstr "あける"
|
79
|
+
|
80
|
+
msgid "open_document"
|
81
|
+
msgstr "オープンドキュメント"
|
82
|
+
|
83
|
+
msgid "openselectedhelp_about"
|
84
|
+
msgstr "オープンのヘルプに関する選択"
|
85
|
+
|
86
|
+
msgid "reload_variables"
|
87
|
+
msgstr "リロード変数"
|
88
|
+
|
89
|
+
msgid "remove_applet"
|
90
|
+
msgstr "アプレットを削除"
|
91
|
+
|
92
|
+
msgid "return"
|
93
|
+
msgstr "復帰"
|
94
|
+
|
95
|
+
msgid "rwdtinker_window_2"
|
96
|
+
msgstr "RwdTinker ウィンドウ2"
|
97
|
+
|
98
|
+
msgid "rwdtinker"
|
99
|
+
msgstr "RwdTinker"
|
100
|
+
|
101
|
+
msgid "rwdtinker_back_window"
|
102
|
+
msgstr "RwdTinker 後ろの窓"
|
103
|
+
|
104
|
+
msgid "rwdtinker_help"
|
105
|
+
msgstr "RwdTinker ヘルプ"
|
106
|
+
|
107
|
+
msgid "rwdtinker_help_window"
|
108
|
+
msgstr "RwdTinker ウィンドウヘルプ"
|
109
|
+
|
110
|
+
msgid "showjump_links"
|
111
|
+
msgstr "表示移動リンク"
|
112
|
+
|
113
|
+
msgid "showdocument_list"
|
114
|
+
msgstr "文書の一覧を表示する"
|
115
|
+
|
116
|
+
msgid "showhelpabout_links"
|
117
|
+
msgstr "リンクについてヘルプを表示する"
|
118
|
+
|
119
|
+
msgid "save"
|
120
|
+
msgstr "保存する"
|
121
|
+
|
122
|
+
msgid "save_changes"
|
123
|
+
msgstr "変更を保存"
|
124
|
+
|
125
|
+
msgid "selection_panel"
|
126
|
+
msgstr "せんたく"
|
127
|
+
|
128
|
+
msgid "selection_tab"
|
129
|
+
msgstr "タブメニュー"
|
130
|
+
|
131
|
+
msgid "tinker_logo"
|
132
|
+
msgstr "Tinker ロゴ"
|
133
|
+
|
134
|
+
msgid "tinkerback_window"
|
135
|
+
msgstr "Tinker Back Window"
|
136
|
+
|
137
|
+
msgid "viewapplet_contents"
|
138
|
+
msgstr ""
|
139
|
+
|
140
|
+
msgid "viewalreadyinstalled_applications"
|
141
|
+
msgstr ""
|
142
|
+
|
143
|
+
msgid "viewinstalled_text"
|
144
|
+
msgstr ""
|
145
|
+
|
146
|
+
msgid "view_platform"
|
147
|
+
msgstr "表示プラットフォーム"
|
148
|
+
|
149
|
+
msgid "viewplatform_information"
|
150
|
+
msgstr "プラットフォームの情報を表示"
|
151
|
+
|
152
|
+
msgid "viewlogger_information"
|
153
|
+
msgstr ""
|
154
|
+
|
155
|
+
msgid "view_event"
|
156
|
+
msgstr "けんかい ぎょうじょ"
|
157
|
+
|
158
|
+
msgid "viewinstall_text"
|
159
|
+
msgstr "ビューをインストールテキスト"
|
160
|
+
|
161
|
+
msgid "viewlistinstall_files"
|
162
|
+
msgstr "リストファイルをインストール"
|
163
|
+
|
164
|
+
msgid "view_photo"
|
165
|
+
msgstr "写真の表示"
|
166
|
+
|
167
|
+
msgid "window"
|
168
|
+
msgstr "ウィンドウ"
|
@@ -0,0 +1,166 @@
|
|
1
|
+
# English Language files for RwdTinker core
|
2
|
+
|
3
|
+
msgid "applet_installed"
|
4
|
+
msgstr "Applet geinstalleerd"
|
5
|
+
|
6
|
+
msgid "application_version"
|
7
|
+
msgstr "Application Version"
|
8
|
+
|
9
|
+
msgid "cancel"
|
10
|
+
msgstr "Annuleren"
|
11
|
+
|
12
|
+
msgid "clickfor_version"
|
13
|
+
msgstr "Klier hier voor de Versie"
|
14
|
+
|
15
|
+
msgid "clickbelowtoviewlistof_zip"
|
16
|
+
msgstr "click below to view lists of zips"
|
17
|
+
|
18
|
+
msgid "documents"
|
19
|
+
msgstr "Documenten"
|
20
|
+
|
21
|
+
msgid "edit"
|
22
|
+
msgstr "edit"
|
23
|
+
|
24
|
+
msgid "file_name"
|
25
|
+
msgstr "File Name:"
|
26
|
+
|
27
|
+
msgid "fill_record"
|
28
|
+
msgstr "Fill Record"
|
29
|
+
|
30
|
+
msgid "help"
|
31
|
+
msgstr "Help"
|
32
|
+
|
33
|
+
msgid "help_about"
|
34
|
+
msgstr "Help About"
|
35
|
+
|
36
|
+
msgid "install_applet"
|
37
|
+
msgstr "install (rwdtinker) applet"
|
38
|
+
|
39
|
+
msgid "jumptoapplication_location"
|
40
|
+
msgstr "Jump to Application Location"
|
41
|
+
|
42
|
+
msgid "list_applets"
|
43
|
+
msgstr "Remove Applets"
|
44
|
+
|
45
|
+
msgid "listappletsinthegem_directory"
|
46
|
+
msgstr "List applets in the Gem Directory"
|
47
|
+
|
48
|
+
msgid "listappletsavailablefor_installation"
|
49
|
+
msgstr "List applets available for installation"
|
50
|
+
|
51
|
+
msgid "list_files"
|
52
|
+
msgstr "List Files"
|
53
|
+
|
54
|
+
msgid "list_installed_gems "
|
55
|
+
msgstr "List installed Gems"
|
56
|
+
|
57
|
+
msgid "list_photos"
|
58
|
+
msgstr "List Photos"
|
59
|
+
|
60
|
+
msgid "list_zips"
|
61
|
+
msgstr "List Zips"
|
62
|
+
|
63
|
+
msgid "listzipdirappletsavailable"
|
64
|
+
msgstr "List (zip directory) applets available for installation"
|
65
|
+
|
66
|
+
msgid "menu_panel"
|
67
|
+
msgstr "Menu Panel"
|
68
|
+
|
69
|
+
msgid "module_unknown"
|
70
|
+
msgstr "Module onbekend"
|
71
|
+
|
72
|
+
msgid "next"
|
73
|
+
msgstr "Volgende"
|
74
|
+
|
75
|
+
msgid "open"
|
76
|
+
msgstr "Openen"
|
77
|
+
|
78
|
+
msgid "open_document"
|
79
|
+
msgstr "Open Document"
|
80
|
+
|
81
|
+
msgid "openselectedhelp_about"
|
82
|
+
msgstr "Open selected help about"
|
83
|
+
|
84
|
+
msgid "reload_variables"
|
85
|
+
msgstr "Reload Variables"
|
86
|
+
|
87
|
+
msgid "remove_applet"
|
88
|
+
msgstr "remove applet"
|
89
|
+
|
90
|
+
msgid "return"
|
91
|
+
msgstr "Return"
|
92
|
+
|
93
|
+
msgid "rwdtinker_window_2"
|
94
|
+
msgstr "RwdTinker Window 2"
|
95
|
+
|
96
|
+
msgid "rwdtinker"
|
97
|
+
msgstr "RwdTinker"
|
98
|
+
|
99
|
+
msgid "rwdtinker_back_window"
|
100
|
+
msgstr '"RwdTinker Back Venster"'
|
101
|
+
|
102
|
+
msgid "rwdtinker_help"
|
103
|
+
msgstr "RwdTinker Help"
|
104
|
+
|
105
|
+
msgid "rwdtinker_help_window"
|
106
|
+
msgstr "RWDTinker Help Venster"
|
107
|
+
|
108
|
+
msgid "showjump_links"
|
109
|
+
msgstr "Show Jump Links"
|
110
|
+
|
111
|
+
msgid "showdocument_list"
|
112
|
+
msgstr "Show Document List"
|
113
|
+
|
114
|
+
msgid "showhelpabout_links"
|
115
|
+
msgstr "Show Help About Links"
|
116
|
+
|
117
|
+
msgid "save"
|
118
|
+
msgstr "Opslaan"
|
119
|
+
|
120
|
+
msgid "save_changes"
|
121
|
+
msgstr "Save Changes"
|
122
|
+
|
123
|
+
msgid "selection_panel"
|
124
|
+
msgstr '"Selectie Paneel"'
|
125
|
+
|
126
|
+
msgid "selection_tab"
|
127
|
+
msgstr "Menu Tab"
|
128
|
+
|
129
|
+
msgid "tinker_logo"
|
130
|
+
msgstr "Tinker Logo"
|
131
|
+
|
132
|
+
msgid "tinkerback_window"
|
133
|
+
msgstr "Tinker Back Window"
|
134
|
+
|
135
|
+
msgid "viewapplet_contents"
|
136
|
+
msgstr "View Applet Contents"
|
137
|
+
|
138
|
+
msgid "viewalreadyinstalled_applications"
|
139
|
+
msgstr "View already installed GEM applications"
|
140
|
+
|
141
|
+
msgid "viewinstalled_text"
|
142
|
+
msgstr "View Install Text"
|
143
|
+
|
144
|
+
msgid "view_platform"
|
145
|
+
msgstr "view platform"
|
146
|
+
|
147
|
+
msgid "viewplatform_information"
|
148
|
+
msgstr "View Platform Information"
|
149
|
+
|
150
|
+
msgid "viewlogger_information"
|
151
|
+
msgstr "View Logger Information"
|
152
|
+
|
153
|
+
msgid "view_event"
|
154
|
+
msgstr "View event"
|
155
|
+
|
156
|
+
msgid "viewinstall_text"
|
157
|
+
msgstr "View Install Text"
|
158
|
+
|
159
|
+
msgid "viewlistinstall_files"
|
160
|
+
msgstr "View List of Installed Files"
|
161
|
+
|
162
|
+
msgid "view_photo"
|
163
|
+
msgstr "View Photo"
|
164
|
+
|
165
|
+
msgid "window"
|
166
|
+
msgstr "Venster"
|
data/lib/rwd/net.rb
CHANGED
@@ -614,10 +614,10 @@ class Request < Hash
|
|
614
614
|
@vars = RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
|
615
615
|
else
|
616
616
|
$stderr.puts "Unknown request ('#{firstline}')."
|
617
|
-
|
618
|
-
|
619
|
-
|
620
|
-
|
617
|
+
end
|
618
|
+
|
619
|
+
$rwdtinkerlog.debug data
|
620
|
+
|
621
621
|
end
|
622
622
|
|
623
623
|
@peeraddr = @io.peeraddr
|
@@ -739,14 +739,15 @@ class HTTPServerException < Exception
|
|
739
739
|
end
|
740
740
|
|
741
741
|
class HTTPServer
|
742
|
-
def self.serve(portio=80, remote=false, auth=nil, realm="
|
742
|
+
def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
|
743
743
|
port, server = portio
|
744
744
|
|
745
745
|
begin
|
746
746
|
server = TCPServer.new(remote ? "0.0.0.0" : "localhost", port) if server.nil?
|
747
|
-
|
747
|
+
if $DEBUG
|
748
748
|
$stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
|
749
|
-
|
749
|
+
end
|
750
|
+
rescue
|
750
751
|
server = nil
|
751
752
|
|
752
753
|
$stderr.puts "Port #{port} is in use."
|
data/lib/rwd/rwd.rb
CHANGED
@@ -57,7 +57,8 @@ if ENV["RWDTHEME"]
|
|
57
57
|
load 'lib/rwdthemes/default.rwd'
|
58
58
|
end
|
59
59
|
if ENV["RWDTHEME"] = "DEFAULT"
|
60
|
-
|
60
|
+
$rwdtinkerlog.info "rwd: loading theme DEFAULT"
|
61
|
+
|
61
62
|
load 'lib/rwdthemes/default.rwd'
|
62
63
|
end
|
63
64
|
if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
|
@@ -267,7 +268,7 @@ class EVTable
|
|
267
268
|
end
|
268
269
|
|
269
270
|
class OpenTag
|
270
|
-
def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
|
271
|
+
def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
|
271
272
|
bef = before[-1]
|
272
273
|
res << Format % ["Before", @subtype] if ($rwd_debug and not bef.nil?)
|
273
274
|
res << bef if not bef.nil?
|
@@ -299,7 +300,7 @@ class OpenTag
|
|
299
300
|
args["nohelpbutton"] = (not help)
|
300
301
|
|
301
302
|
template = $rwd_html_1
|
302
|
-
template = $rwd_html_PDA_1 if pda
|
303
|
+
# template = $rwd_html_PDA_1 if pda
|
303
304
|
|
304
305
|
res << (template(template, args))
|
305
306
|
when "p" then res << "<p #{align}>"
|
@@ -493,7 +494,7 @@ class OpenTag
|
|
493
494
|
after.push(aft)
|
494
495
|
end
|
495
496
|
|
496
|
-
def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
|
497
|
+
def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
|
497
498
|
case @subtype
|
498
499
|
when "vertical", "window", "helpwindow", "tab", "panel"
|
499
500
|
res << Format % ["BefPost", @subtype] if $rwd_debug
|
@@ -635,7 +636,7 @@ class OpenTag
|
|
635
636
|
end
|
636
637
|
|
637
638
|
class Text
|
638
|
-
def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
|
639
|
+
def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
|
639
640
|
if not @text.scan(/[^ \t\r\n]/).empty?
|
640
641
|
res << Format % ["Text", ""] if $rwd_debug
|
641
642
|
res << "#{@text}"
|
@@ -742,8 +743,8 @@ class RWDWindow
|
|
742
743
|
end
|
743
744
|
|
744
745
|
rescue
|
745
|
-
|
746
|
-
|
746
|
+
$rwdtinkerlog.error "error in RWDWindow - render method"
|
747
|
+
|
747
748
|
end
|
748
749
|
end
|
749
750
|
|
@@ -864,13 +865,11 @@ class RWDialog
|
|
864
865
|
|
865
866
|
post.sort.each do |key, value|
|
866
867
|
puts "Post: #{key} -> #{value.from_html.inspect}" if $rwd_debug
|
867
|
-
|
868
|
-
|
869
|
-
end
|
868
|
+
$rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
|
869
|
+
|
870
870
|
vars[key] = value.from_html
|
871
|
-
|
872
|
-
|
873
|
-
end
|
871
|
+
$rwdtinkerlog.info "rwd: #{value.from_html}\n"
|
872
|
+
|
874
873
|
end
|
875
874
|
|
876
875
|
# Stack handling for rwd_action, rwd_window and rwd_tab.
|
@@ -938,16 +937,14 @@ class RWDialog
|
|
938
937
|
# Copy vars from window to instance.
|
939
938
|
|
940
939
|
vars.each do |k, v|
|
941
|
-
|
942
|
-
|
943
|
-
end
|
940
|
+
$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
|
941
|
+
|
944
942
|
if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
|
945
943
|
|
946
944
|
instance_eval "@#{k} = ''"
|
947
945
|
instance_variable_set("@#{k}", vars.fetch("#{k}"))
|
948
|
-
|
949
|
-
|
950
|
-
end
|
946
|
+
$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
|
947
|
+
|
951
948
|
end
|
952
949
|
end
|
953
950
|
|
@@ -955,7 +952,9 @@ class RWDialog
|
|
955
952
|
|
956
953
|
if (not back) or @rwd_call_after_back.include?(@rwd_action)
|
957
954
|
unless @rwd_action =~ /^rwd_/
|
958
|
-
|
955
|
+
|
956
|
+
$rwdtinkerlog.debug "Method: #{@rwd_action}(#{@rwd_args})"
|
957
|
+
|
959
958
|
if methods.include?(@rwd_action)
|
960
959
|
method(@rwd_action).call(*@rwd_args)
|
961
960
|
else
|
@@ -1025,9 +1024,9 @@ begin # error block
|
|
1025
1024
|
end
|
1026
1025
|
res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
|
1027
1026
|
rescue
|
1028
|
-
|
1029
|
-
|
1030
|
-
|
1027
|
+
|
1028
|
+
$rwdtinkerlog.error "rwd: error in render"
|
1029
|
+
|
1031
1030
|
end
|
1032
1031
|
end
|
1033
1032
|
end
|
@@ -1105,7 +1104,9 @@ end
|
|
1105
1104
|
Thread.new do
|
1106
1105
|
loop do
|
1107
1106
|
if Time.now - @rwd_time > @rwd_timeout
|
1108
|
-
|
1107
|
+
|
1108
|
+
$rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
|
1109
|
+
|
1109
1110
|
exit 1
|
1110
1111
|
end
|
1111
1112
|
sleep interval
|
@@ -1185,7 +1186,7 @@ class RWDSession < Hash
|
|
1185
1186
|
@lastaccess = Time.now
|
1186
1187
|
end
|
1187
1188
|
|
1188
|
-
def render(res, path, post, download, downloadfile, pda)
|
1189
|
+
def render(res, path, post, download, downloadfile, pda=false)
|
1189
1190
|
done = self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
|
1190
1191
|
|
1191
1192
|
res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
|
@@ -1212,7 +1213,8 @@ class RWDServer
|
|
1212
1213
|
|
1213
1214
|
@browserthread =
|
1214
1215
|
Thread.new do
|
1215
|
-
|
1216
|
+
$rwdtinkerlog.warn "rwd: Starting the browser..."
|
1217
|
+
|
1216
1218
|
|
1217
1219
|
#if ENV["RWDBROWSER"].downcase =~ /iexplore/ # ???
|
1218
1220
|
#@ie = IE.new("http://localhost:#{port}/")
|
@@ -1226,7 +1228,7 @@ class RWDServer
|
|
1226
1228
|
|
1227
1229
|
command.gsub!(/%port%/, port.to_s)
|
1228
1230
|
|
1229
|
-
system(command) or $
|
1231
|
+
system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
|
1230
1232
|
#end
|
1231
1233
|
|
1232
1234
|
puts "The browser has terminated."
|
@@ -1337,8 +1339,8 @@ class RWDServer
|
|
1337
1339
|
resp << download
|
1338
1340
|
end
|
1339
1341
|
rescue
|
1340
|
-
|
1341
|
-
|
1342
|
+
|
1343
|
+
$rwdtinkerlog.error "rwd: Sending response to browser failed."
|
1342
1344
|
@sessions.delete(session.sessionid)
|
1343
1345
|
end
|
1344
1346
|
|
@@ -1352,8 +1354,9 @@ class RWDServer
|
|
1352
1354
|
|
1353
1355
|
if @browserstarted and not @browserthread.nil? and @browserthread.alive?
|
1354
1356
|
resp.stop do
|
1355
|
-
|
1356
|
-
|
1357
|
+
|
1358
|
+
$rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
|
1359
|
+
|
1357
1360
|
@browserthread.join
|
1358
1361
|
end
|
1359
1362
|
end
|