1
=== modified file 'resources/sextant/web/index.html'
2
--- resources/sextant/web/index.html	2014-09-04 09:46:18 +0000
3
+++ resources/sextant/web/index.html	2015-07-09 15:37:33 +0000
4
@@ -12,20 +12,23 @@
5
12
    <link rel="stylesheet" type="text/css" href="style_sheet.css"/>
12
    <link rel="stylesheet" type="text/css" href="style_sheet.css"/>
6
13
    <title>Sextant</title>
13
    <title>Sextant</title>
7
14
</head>
14
</head>
18
15
<body style="height:100%" class="titlescreen">
15
<body style="height:100%" class="titlescreen" onload="get_names_for_autocomplete('programs_with_metadata')">
19
16
    <div class="centered">
16
    <div id="wholebody">
20
17
        <div id="titlescreen-logo-text">
17
        <div class="titlescreen-topbar"> 
21
18
            Sextant
18
            <div id="titlescreen-logo-text">Sextant</div>
22
19
        </div>
19
            <p style="text-align:center"> Choose a program to explore: </p>
23
20
        <div>
20
        </div> 
24
21
            <button class="button" onclick="window.location='interface.html'">Open Sextant Explorer</button>
21
     
25
22
            <!--<button class="button">View Programs</button>-->
22
        <div id="main" class="main"> 
26
23
        </div>
23
	        <div id="programs_list" type="scrolling-block"> </div>
27
24
    </div>
24
        </div>
28
25
25
30
26
    <div id="titlescreen-bottombar">
26
        <div id="titlescreen-bottombar" type="titlescreen-bottombar"> 
31
27
        To add a program to Sextant, use '<b>sextant add-program</b>' from the command line
27
        To add a program to Sextant, use '<b>sextant add-program</b>' from the command line
32
28
        </div>
33
29
34
28
    </div>
30
    </div>
35
31
    <script src="queryjavascript.js"></script>
36
29
32
37
30
</body>
33
</body>
38
31
</html>
34
</html>
39
32
35
40
=== modified file 'resources/sextant/web/interface.html'
41
--- resources/sextant/web/interface.html	2014-11-24 11:21:16 +0000
42
+++ resources/sextant/web/interface.html	2015-07-09 15:37:33 +0000
43
@@ -9,18 +9,16 @@
44
9
<html>
9
<html>
45
10
<head>
10
<head>
46
11
<meta charset="utf-8"/>
11
<meta charset="utf-8"/>
48
12
 	<link rel="stylesheet" type="text/css" href="style_sheet.css"/>
12
 	<link rel="stylesheet" type="text/css" href="/style_sheet.css"/>
49
13
    <title> Sextant Explorer </title>
13
    <title> Sextant Explorer </title>
50
14
    <script src="/queryjavascript.js"></script>
51
14
</head>
15
</head>
52
15
16
54
16
<body onload="get_names_for_autocomplete('programs'); set_arguments('', ''); show_item('welcome')">
17
<body onload="get_names_for_autocomplete('funcs_both'); set_arguments('', ''); show_item('welcome')">
55
17
    <div class="toolbar">
18
    <div class="toolbar">
56
18
        <div>
19
        <div>
62
19
            Program: 
20
	    <button class="button" onclick="window.location.href='/'">Choose new program</button>
63
20
            <input list="program_names" id="program_name" class="textbox" style="width: 150px"
21
	    
59
21
             onchange="get_names_for_autocomplete('funcs_both')"/>
60
22
            <datalist id="program_names"></datalist>
61
23
64
24
            <select id="query_list" class="dropdown" onchange="display_when();">
22
            <select id="query_list" class="dropdown" onchange="display_when();">
65
25
                <option value="whole_program">Whole graph</option>
23
                <option value="whole_program">Whole graph</option>
66
26
                <option value="functions_calling">
24
                <option value="functions_calling">
67
@@ -36,20 +34,20 @@
68
36
            </select>
34
            </select>
69
37
            &nbsp;&nbsp;&nbsp;
35
            &nbsp;&nbsp;&nbsp;
70
38
            <label>
36
            <label>
71
37
                Suppress common functions?
72
39
                <input type="checkbox" id="suppress_common" value="True"></input>
38
                <input type="checkbox" id="suppress_common" value="True"></input>
73
40
                Suppress common functions?
74
41
            </label>
39
            </label>
75
42
            <label>
40
            <label>
76
41
                Limit to internal calls?
77
43
                <input type="checkbox" id="limit_internal" value="True"></input>
42
                <input type="checkbox" id="limit_internal" value="True"></input>
78
44
                Limit to internal calls?
79
45
            </label>
43
            </label>
80
46
            <label>
44
            <label>
81
45
                Maximum call depth:
82
47
                <input type="number" id="max_depth" value="1" min="0" max="10"></input>
46
                <input type="number" id="max_depth" value="1" min="0" max="10"></input>
83
48
                Maximum call depth.
84
49
            </label>
47
            </label>
85
50
            <button class="button" style="float:right; margin: 1px 20px -1px 0;" onclick="execute_query()">Run Query</button>
48
            <button class="button" style="float:right; margin: 1px 20px -1px 0;" onclick="execute_query()">Run Query</button>
86
51
        </div>
49
        </div>
88
52
        <div id="toolbar-row2" style="margin-left: 234px;">
50
        <div id="toolbar-row2">
89
53
            <!--list to populate arguments.  Updates when program name is specified-->
51
            <!--list to populate arguments.  Updates when program name is specified-->
90
54
            <datalist id="function_names_1"></datalist>
52
            <datalist id="function_names_1"></datalist>
91
55
            <datalist id="function_names_2"></datalist>
53
            <datalist id="function_names_2"></datalist>
92
@@ -65,7 +63,7 @@
93
65
63
94
66
64
95
67
    <!-- Output for image file-->
65
    <!-- Output for image file-->
97
68
    <img id=output_image src="sextant.jpg"
66
    <img id=output_image src="/sextant.gif"
98
69
        class="pos_img"
67
        class="pos_img"
99
70
        style="align: bottom; font-style: italic; color: #C0C0C0; font-size: 15px" />
68
        style="align: bottom; font-style: italic; color: #C0C0C0; font-size: 15px" />
100
71
69
101
@@ -74,7 +72,10 @@
102
74
72
103
75
    <div class="centered" id="welcome">
73
    <div class="centered" id="welcome">
104
76
        <div class="title">Welcome to Sextant Explorer</div>
74
        <div class="title">Welcome to Sextant Explorer</div>
106
77
        <div class="subtitle"><b>To begin</b>: enter a program name, choose a query, and click 'Run Query'</div>
75
        <div class="subtitle">
107
76
            Your current program is <b id="prog_name"></b><br>
108
77
            <b>To begin</b>: choose a query, and click 'Run Query'</div>
109
78
            <script>document.getElementById("prog_name").innerHTML = get_program_name()</script>
110
78
        </div>
79
        </div>
111
79
    </div>
80
    </div>
112
80
81
113
@@ -90,6 +91,5 @@
114
90
        </div>
91
        </div>
115
91
    </div>
92
    </div>
116
92
93
117
93
    <script src="queryjavascript.js"></script>
118
94
</body>
94
</body>
119
95
</html>
95
</html>
120
96
96
121
=== modified file 'resources/sextant/web/queryjavascript.js'
122
--- resources/sextant/web/queryjavascript.js	2014-12-02 14:00:57 +0000
123
+++ resources/sextant/web/queryjavascript.js	2015-07-09 15:37:33 +0000
124
@@ -5,27 +5,26 @@
125
5
//Runs query and "GET"s either program names uploaded on the 
5
//Runs query and "GET"s either program names uploaded on the 
126
6
//server or function names from a specific program.
6
//server or function names from a specific program.
127
7
7
129
8
8
"use strict";
130
9
var timeout = null;
9
var timeout = null;
131
10
var do_timeout = false;
10
var do_timeout = false;
132
11
11
133
12
134
13
function get_names_for_autocomplete(info_needed, search) {
12
function get_names_for_autocomplete(info_needed, search) {
135
14
    //Function queries to database to create a list 
13
    //Function queries to database to create a list 
137
15
    //which is used to populate the auto-complete text boxes.
14
    //which is used to populate the auto-complete text boxes, 
138
15
    //and to add program buttons on index.html
139
16
    if (typeof search == 'undefined') {
16
    if (typeof search == 'undefined') {
140
17
        search = "";
17
        search = "";
141
18
    }
18
    }
142
19
    
19
    
143
20
    var xmlhttp = new XMLHttpRequest();
20
    var xmlhttp = new XMLHttpRequest();
144
21
    xmlhttp.onreadystatechange = function() {
21
    xmlhttp.onreadystatechange = function() {
146
22
        if (xmlhttp.status = 200) {
22
        if (xmlhttp.status == 200) {
147
23
            var values_list = xmlhttp.responseText;
23
            var values_list = xmlhttp.responseText;
148
24
            if (values_list != "") {
24
            if (values_list != "") {
149
25
                values_list = JSON.parse(values_list);
25
                values_list = JSON.parse(values_list);
153
26
                if (info_needed =='programs') {
26
                if (info_needed =='programs_with_metadata') {
154
27
                    //We need to populate the program names list
27
                    add_program_buttons_with_metadata(values_list);
152
28
                    add_options("program_names", values_list);
155
29
                    do_timeout = false;
28
                    do_timeout = false;
156
30
                }
29
                }
157
31
                if (info_needed == 'funcs_with_timeout_1') {
30
                if (info_needed == 'funcs_with_timeout_1') {
158
@@ -41,12 +40,11 @@
159
41
                    add_options("function_names_2", values_list);
40
                    add_options("function_names_2", values_list);
160
42
                    do_timeout = false;
41
                    do_timeout = false;
161
43
                }
42
                }
162
44
163
45
            }
43
            }
164
46
        }
44
        }
165
47
    }
45
    }
166
48
    
46
    
168
49
    if (info_needed == 'programs') {
47
    if (info_needed == 'programs_with_metadata') {
169
50
        var string = "/database_properties?query=" + info_needed + "&program_name=";
48
        var string = "/database_properties?query=" + info_needed + "&program_name=";
170
51
        xmlhttp.open("GET", string, true);
49
        xmlhttp.open("GET", string, true);
171
52
        xmlhttp.send();
50
        xmlhttp.send();
172
@@ -61,7 +59,7 @@
173
61
59
174
62
        var timeoutfn = function() {
60
        var timeoutfn = function() {
175
63
            var string = "/database_properties?query=" + "functions" + 
61
            var string = "/database_properties?query=" + "functions" + 
177
64
                "&program_name=" + document.getElementById("program_name").value +
62
                "&program_name=" + get_program_name() + 
178
65
                "&search=" + document.getElementById(target).value;
63
                "&search=" + document.getElementById(target).value;
179
66
            xmlhttp.open("GET", string, true);
64
            xmlhttp.open("GET", string, true);
180
67
            xmlhttp.send();
65
            xmlhttp.send();
181
@@ -85,7 +83,7 @@
182
85
function add_options(selectedlist, values_list) {
83
function add_options(selectedlist, values_list) {
183
86
    //Adds all the options obtained from the list of program 
84
    //Adds all the options obtained from the list of program 
184
87
    //names or function names to an auto complete drop-down box
85
    //names or function names to an auto complete drop-down box
186
88
    var options = ''
86
    var options = '';
187
89
    if (values_list.length == 1 || values_list.length ==0) {
87
    if (values_list.length == 1 || values_list.length ==0) {
188
90
        options += '<option value="'+values_list+'"/>';
88
        options += '<option value="'+values_list+'"/>';
189
91
    } else {
89
    } else {
190
@@ -96,6 +94,35 @@
191
96
    document.getElementById(selectedlist).innerHTML = options;
94
    document.getElementById(selectedlist).innerHTML = options;
192
97
}
95
}
193
98
96
194
97
function add_program_buttons_with_metadata(values_list) {
195
98
    // Adds one button for each available program to the button list (in index.html)
196
99
    // Also adds the required metadata, currently:
197
100
    // {program_name} (in bold)
198
101
    // User: {uploader} 
199
102
    // Date: {date}
200
103
201
104
    // sorts the programs so that most recently uploaded appear first 
202
105
    var field = "date";
203
106
    values_list.sort(function(x,y) {
204
107
        if (x[field] > y[field]) {
205
108
            return -1;
206
109
        }
207
110
        if (x[field] < y[field]) {
208
111
            return 1;
209
112
        }
210
113
        return 0;
211
114
    });
212
115
213
116
    var buttons = '';
214
117
    for (var i=0; i < values_list.length;++i) {
215
118
        // Add button with id = program name and onclick = go to /program/{program name} and text as required
216
119
        var date = values_list[i]["date"].split(' ')[0];
217
120
        buttons += '<button type="button" class="program_button" id=' + values_list[i]["program_name"] + 
218
121
            ' onclick=window.location="/program/' + values_list[i]["program_name"] + '">' + '<b>' + values_list[i]["program_name"] + '</b> <br> <small>User: </small>' + values_list[i]["uploader"] + '<br> <small>Date: </small>' + date + '</button>';
219
122
    }
220
123
    document.getElementById("programs_list").innerHTML = buttons;
221
124
}
222
125
223
99
126
224
100
function set_argument(number, label) {
127
function set_argument(number, label) {
225
101
    var argEl = document.getElementById("argument_" + number);
128
    var argEl = document.getElementById("argument_" + number);
226
@@ -126,7 +153,7 @@
227
126
    var query_list = document.getElementById("query_list");
153
    var query_list = document.getElementById("query_list");
228
127
154
229
128
    var no_functions = new Array();
155
    var no_functions = new Array();
231
129
    var prog_name = document.getElementById("program_name").value;
156
    var prog_name = get_program_name();
232
130
    if (query_list.options[query_list.selectedIndex].value == "functions_calling") {
157
    if (query_list.options[query_list.selectedIndex].value == "functions_calling") {
233
131
        set_arguments("Function being called", "");
158
        set_arguments("Function being called", "");
234
132
    }
159
    }
235
@@ -151,7 +178,7 @@
236
151
178
237
152
function execute_query() {
179
function execute_query() {
238
153
    document.getElementById("output_image").src = "";
180
    document.getElementById("output_image").src = "";
240
154
181
    
241
155
    //Returns error in alert window if query not executed properly, 
182
    //Returns error in alert window if query not executed properly, 
242
156
    //otherwise performs the query and outputs it
183
    //otherwise performs the query and outputs it
243
157
    show_item("please-wait");
184
    show_item("please-wait");
244
@@ -159,14 +186,14 @@
245
159
    if (query_id == "function_names") {
186
    if (query_id == "function_names") {
246
160
        //url for page containing all function names
187
        //url for page containing all function names
247
161
        var string = "/database_properties?program_name=" + 
188
        var string = "/database_properties?program_name=" + 
249
162
        document.getElementById("program_name").value + "&query=functions";
189
        get_program_name() + "&query=functions";
250
163
    } else {
190
    } else {
251
164
        //If not function names we will want a graph as an output; 
191
        //If not function names we will want a graph as an output; 
252
165
        //url returns svg file of graph.
192
        //url returns svg file of graph.
253
166
        // We use a random number argument to prevent caching.
193
        // We use a random number argument to prevent caching.
254
167
        var string = "/output_graph.svg?stop_cache=" + String(Math.random()) + "&program_name=" + 
194
        var string = "/output_graph.svg?stop_cache=" + String(Math.random()) + "&program_name=" + 
257
168
            document.getElementById("program_name").value + 
195
            get_program_name() + 
258
169
            "&query=" + query_id + "&function_calling=";
196
	    "&query=" + query_id + "&function_calling=";
259
170
        string = string + document.getElementById("function_1").value + 
197
        string = string + document.getElementById("function_1").value + 
260
171
            "&function_called=" + document.getElementById("function_2").value;
198
            "&function_called=" + document.getElementById("function_2").value;
261
172
        string = string + "&suppress_common=" + 
199
        string = string + "&suppress_common=" + 
262
@@ -232,3 +259,13 @@
263
232
    show_item("error");
259
    show_item("error");
264
233
    document.getElementById("error-msg").innerHTML = msg;
260
    document.getElementById("error-msg").innerHTML = msg;
265
234
}
261
}
266
262
267
263
function get_program_name() {
268
264
    // Provided there is a program name in the url (expected form is localhost:#/program/prog_name
269
265
    // this returns the prog_name
270
266
271
267
    var url = document.URL;
272
268
    var prog_name = url.split('/').reverse()[0];
273
269
    return prog_name;
274
270
}
275
271
276
235
272
277
=== modified file 'resources/sextant/web/style_sheet.css'
278
--- resources/sextant/web/style_sheet.css	2014-09-04 09:46:18 +0000
279
+++ resources/sextant/web/style_sheet.css	2015-07-09 15:37:33 +0000
280
@@ -15,8 +15,9 @@
281
15
    padding: 0;
15
    padding: 0;
282
16
}
16
}
283
17
17
284
18
285
18
body.titlescreen {
19
body.titlescreen {
287
19
    background-color: rgb(105, 145, 172);
20
    background: rgb(105, 145, 172);
288
20
    color: rgb(245, 245, 245);
21
    color: rgb(245, 245, 245);
289
21
}
22
}
290
22
23
291
@@ -40,37 +41,56 @@
292
40
	text-align:center; background:#000000
41
	text-align:center; background:#000000
293
41
}
42
}
294
42
43
298
43
44
div.main {
299
44
45
    height:auto;
300
45
46
    padding:5px;
301
47
    padding-top:10px;
302
48
    margin-bottom:60px;
303
49
    width:60%;
304
50
    margin-left:20%;   
305
51
    text-align:center;
306
52
}
307
46
53
308
47
div.centered {
54
div.centered {
309
48
    position: absolute;
55
    position: absolute;
310
49
    left: 50%;
56
    left: 50%;
311
50
    top: 40%;   /* for good design we position nearer the top */
57
    top: 40%;   /* for good design we position nearer the top */
313
51
    transform: translate(-50%, -40%);    
58
    transform: translate(-50%, -40%);
314
52
    -webkit-transform: translate(-50%, -40%);
59
    -webkit-transform: translate(-50%, -40%);
315
53
    -moz-transform: translate(-50%, -40%);
60
    -moz-transform: translate(-50%, -40%);
316
54
    -ms-transform: translate(-50%, -40%);
61
    -ms-transform: translate(-50%, -40%);
317
55
    text-align: center;
62
    text-align: center;
318
56
}
63
}
319
57
64
320
65
scrolling-block {
321
66
    height:auto;
322
67
    overflow-y:auto;
323
68
}
324
69
325
58
#titlescreen-logo-text {
70
#titlescreen-logo-text {
326
59
    font-size: 80px;
71
    font-size: 80px;
327
60
    font-family: 'Poiret One', sans-serif;
72
    font-family: 'Poiret One', sans-serif;
328
61
    letter-spacing: -2px;
73
    letter-spacing: -2px;
329
62
    padding-bottom: 4px;
74
    padding-bottom: 4px;
330
75
    text-align:center;
331
63
}
76
}
332
64
77
333
65
#titlescreen-bottombar {
78
#titlescreen-bottombar {
334
66
    font-size: 20px;
79
    font-size: 20px;
336
67
    position: absolute;
80
    position: fixed;
337
68
    left: 0;
81
    left: 0;
338
69
    bottom: 0;
82
    bottom: 0;
339
70
    right: 0;
83
    right: 0;
341
71
    height: 80px;
84
    height: 40px;
342
72
    font-weight: 300;
85
    font-weight: 300;
343
73
    text-align: center;
86
    text-align: center;
344
87
    background:rgb(105,145,172);
345
88
}
346
89
347
90
#titlescreen-topbar {
348
91
    position:fixed;
349
92
    height:60px;
350
93
    background:rgb(105,145,172);
351
74
}
94
}
352
75
95
353
76
.toolbar {
96
.toolbar {
354
@@ -90,6 +110,36 @@
355
90
    border: none;
110
    border: none;
356
91
}
111
}
357
92
112
358
113
.program_button {
359
114
    background: rgb(135, 175, 202);
360
115
    background: -moz-linear-gradient(top,rgb(135, 175, 202) 0%,rgb(95, 135, 162) 100%);
361
116
    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,rgb(135, 175, 202)),color-stop(100%,rgb(95, 135, 162)));
362
117
    background: -webkit-linear-gradient(top,rgb(135, 175, 202) 0%,rgb(95, 135, 162) 100%);
363
118
    background: -o-linear-gradient(top,rgb(135, 175, 202) 0%,rgb(95, 135, 162) 100%);
364
119
    background: -ms-linear-gradient(top,rgb(135, 175, 202) 0%,rgb(95, 135, 162) 100%);
365
120
    background: linear-gradient(top,rgb(135, 175, 202) 0%,rgb(95, 135, 162) 100%);
366
121
    filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='rgb(135, 175, 202)',endColorstr='rgb(95, 135, 162)',GradientType=0);
367
122
    padding:8px 13px;
368
123
    color:#fff;
369
124
    font-family:'Source Sans Pro',sans-serif;
370
125
    font-size:17px;
371
126
    border-radius:4px;
372
127
    -moz-border-radius:4px;
373
128
    -webkit-border-radius:4px;
374
129
    border:1px solid rgb(95, 135, 162)
375
130
}
376
131
377
132
.program_button:hover{
378
133
    background: rgb(125, 165, 192);
379
134
    background: -moz-linear-gradient(top,rgb(155, 195, 222) 0%,rgb(125, 165, 192) 100%);
380
135
    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,rgb(155, 195, 222)),color-stop(100%,rgb(125, 165, 192)));
381
136
    background: -webkit-linear-gradient(top,rgb(155, 195, 222) 0%,rgb(125, 165, 192) 100%);
382
137
    background: -o-linear-gradient(top,rgb(155, 195, 222) 0%,rgb(125, 165, 192) 100%);
383
138
    background: -ms-linear-gradient(top,rgb(155, 195, 222) 0%,rgb(125, 165, 192) 100%);
384
139
    background: linear-gradient(top,rgb(155, 195, 222) 0%,rgb(125, 165, 192) 100%);
385
140
    filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='rgb(155, 195, 222)',endColorstr='rgb(125, 165, 192)',GradientType=0);
386
141
}    
387
142
388
93
.textbox {
143
.textbox {
389
94
    background-color: rgb(245, 245, 245);
144
    background-color: rgb(245, 245, 245);
390
95
    border: 1px solid rgb(103, 114, 122);
145
    border: 1px solid rgb(103, 114, 122);
391
96
146
392
=== modified file 'src/sextant/web/server.py'
393
--- src/sextant/web/server.py	2014-12-18 17:00:51 +0000
394
+++ src/sextant/web/server.py	2015-07-09 15:37:33 +0000
395
@@ -7,7 +7,7 @@
396
7
# Note: this must be run in Python 2.
7
# Note: this must be run in Python 2.
397
8
8
398
9
from twisted.web.server import Site, NOT_DONE_YET
9
from twisted.web.server import Site, NOT_DONE_YET
400
10
from twisted.web.resource import Resource
10
from twisted.web.resource import Resource, NoResource
401
11
from twisted.web.static import File
11
from twisted.web.static import File
402
12
from twisted.internet import reactor
12
from twisted.internet import reactor
403
13
from twisted.internet.threads import deferToThread
13
from twisted.internet.threads import deferToThread
404
@@ -33,6 +33,10 @@
405
33
# global SextantConnection object which deals with the port forwarding
33
# global SextantConnection object which deals with the port forwarding
406
34
CONNECTION = None
34
CONNECTION = None
407
35
35
408
36
# global list of program names for validation - prevents synchronously fetching
409
37
# on page loads, occupying the server
410
38
PROGRAM_NAMES = []
411
39
412
36
# The maximum number of matches to display for autocomplete. If more than
40
# The maximum number of matches to display for autocomplete. If more than
413
37
# this are matched, nothing will be returned.
41
# this are matched, nothing will be returned.
414
38
AUTOCOMPLETE_NAMES_LIMIT = 75
42
AUTOCOMPLETE_NAMES_LIMIT = 75
415
@@ -250,7 +254,19 @@
416
250
254
417
251
    @staticmethod
255
    @staticmethod
418
252
    def _get_program_names():
256
    def _get_program_names():
420
253
        return CONNECTION.get_program_names()
257
        # Keep list used for URL validation up to date
421
258
        global PROGRAM_NAMES
422
259
        PROGRAM_NAMES = CONNECTION.get_program_names()
423
260
        return PROGRAM_NAMES
424
261
425
262
    @staticmethod
426
263
    def _get_programs_with_metadata():
427
264
        # Converts set of namedtuples to a list of dictionaries
428
265
        # for serialisation into JSON.
429
266
        global PROGRAM_NAMES
430
267
        progs_with_metadata = CONNECTION.programs_with_metadata()
431
268
        PROGRAM_NAMES = [ntuple.program_name for ntuple in progs_with_metadata]
432
269
        return [ntuple._asdict() for ntuple in progs_with_metadata]
433
254
270
434
255
    @staticmethod
271
    @staticmethod
435
256
    def _get_function_names(program_name, search=""):
272
    def _get_function_names(program_name, search=""):
436
@@ -283,6 +299,13 @@
437
283
            request.finish()
299
            request.finish()
438
284
            defer.returnValue(None)
300
            defer.returnValue(None)
439
285
301
440
302
        elif query == 'programs_with_metadata':
441
303
            request.setHeader("content-type", "application/json")
442
304
            prog_metadata = yield deferToThread(self._get_programs_with_metadata)
443
305
            request.write(json.dumps(prog_metadata))
444
306
            request.finish()
445
307
            defer.returnValue(None)
446
308
447
286
        elif query == 'functions':
309
        elif query == 'functions':
448
287
            if "program_name" not in request.args:
310
            if "program_name" not in request.args:
449
288
                request.setResponseCode(400)
311
                request.setResponseCode(400)
450
@@ -310,7 +333,7 @@
451
310
        else:
333
        else:
452
311
            request.setResponseCode(400)
334
            request.setResponseCode(400)
453
312
            request.setHeader("content-type", "text/plain")
335
            request.setHeader("content-type", "text/plain")
455
313
            request.write("'Query' parameter should be 'programs' or 'functions'.")
336
            request.write("'Query' parameter should be 'programs', 'programs_with_metadata' or 'functions'.")
456
314
            request.finish()
337
            request.finish()
457
315
            defer.returnValue(None)
338
            defer.returnValue(None)
458
316
339
459
@@ -320,10 +343,12 @@
460
320
343
461
321
344
462
322
def serve_site(connection, port):
345
def serve_site(connection, port):
464
323
    global CONNECTION
346
    global CONNECTION, PROGRAM_NAMES
465
324
347
466
325
    CONNECTION = connection
348
    CONNECTION = connection
467
326
349
468
350
    # saves making this synchronous call every page load
469
351
    PROGRAM_NAMES = CONNECTION.get_program_names()
470
327
352
471
328
    # serve static directory at root
353
    # serve static directory at root
472
329
    root = File(os.path.join(environment.RESOURCES_DIR, 'sextant', 'web'))
354
    root = File(os.path.join(environment.RESOURCES_DIR, 'sextant', 'web'))
473
@@ -331,6 +356,17 @@
474
331
    # serve a dynamic Echoer webpage at /echoer.html
356
    # serve a dynamic Echoer webpage at /echoer.html
475
332
    root.putChild("echoer.html", Echoer())
357
    root.putChild("echoer.html", Echoer())
476
333
358
477
359
    # serve static files at /program/{anything}
478
360
    grandchild = File(os.path.join(environment.RESOURCES_DIR, 'sextant', 'web', 'interface.html'))
479
361
    class ServeInterface(Resource): # all children of this class are grandchild
480
362
        def getChild(self, name, request):
481
363
            if not name in PROGRAM_NAMES:
482
364
                return NoResource("The program {} was not found in the database.".format(name)
483
365
                    + "<br>If you just added that program, please go to the front page first.")
484
366
            else:
485
367
                return grandchild
486
368
    root.putChild("program", ServeInterface())
487
369
488
334
    # serve a dynamic webpage at /Sextant_properties to return graph properties
370
    # serve a dynamic webpage at /Sextant_properties to return graph properties
489
335
    root.putChild("database_properties", GraphProperties())
371
    root.putChild("database_properties", GraphProperties())
490
336
372
Status:	Merged
Approved by:	ChrisD on 2015-07-09
Approved revision:	68
Merged at revision:	47
Proposed branch:	lp:~isaacd-u/ensoft-sextant/program-selection
Merge into:	lp:ensoft-sextant
Diff against target:	489 lines (+178/-52) 5 files modified resources/sextant/web/index.html (+14/-11) resources/sextant/web/interface.html (+14/-14) resources/sextant/web/queryjavascript.js (+53/-16) resources/sextant/web/style_sheet.css (+57/-7) src/sextant/web/server.py (+40/-4)
To merge this branch:	bzr merge lp:~isaacd-u/ensoft-sextant/program-selection
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ChrisD		2015-07-09	Approve on 2015-07-09
Review via email: mp+264265@code.launchpad.net