Skip to content

Commit 9f51c24

Browse files
author
devbruce
committed
Add Exception handling of SNA Interactive
1 parent 02d7a21 commit 9f51c24

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

app/templates/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h2 class="text-center">Text Data Visualizer</h2>
6060
<button class="btn btn-lg btn-primary dropdown-toggle mt-3 mb-3" type="button" data-toggle="collapse" data-target="#mode-default" aria-expanded="false" aria-controls="mode-default">Data Input Mode : Default</button>
6161
<div class="collapse" id="mode-default">
6262
<div class="card card-body bg-light mb-3">
63-
<a class="btn btn-lg btn-outline-dark mb-3" href="{% url 'viz:sna_interactive' %}"><h5 class="set-inline">Semantic Network Analysis</h5> <span class="badge badge-pill badge-danger">Interactive</span></a>
63+
<a class="btn btn-lg btn-outline-dark mb-3" href="{% url 'viz:sna-interactive' %}"><h5 class="set-inline">Semantic Network Analysis</h5> <span class="badge badge-pill badge-danger">Interactive</span></a>
6464
<a class="btn btn-lg btn-outline-dark" href="{% url 'viz:wc' %}"><h5 class="set-inline">Word Cloud</h5> <span class="badge badge-pill badge-warning">Simple Image</span></a>
6565
</div>
6666
</div>
@@ -70,8 +70,8 @@ <h2 class="text-center">Text Data Visualizer</h2>
7070
<button class="btn btn-lg btn-primary dropdown-toggle mt-3 mb-3" type="button" data-toggle="collapse" data-target="#mode-file" aria-expanded="false" aria-controls="mode-file">Data Input Mode : File</button>
7171
<div class="collapse" id="mode-file">
7272
<div class="card card-body bg-light mb-3">
73-
<a class="btn btn-lg btn-outline-dark mb-3" href="{% url 'viz:sna_interactive_file' %}"><h5 class="set-inline">Semantic Network Analysis</h5> <span class="badge badge-pill badge-danger">Interactive</span></a>
74-
<a class="btn btn-lg btn-outline-dark" href="{% url 'viz:wc_file' %}"><h5 class="set-inline">Word Cloud</h5> <span class="badge badge-pill badge-warning">Simple Image</span></a>
73+
<a class="btn btn-lg btn-outline-dark mb-3" href="{% url 'viz:sna-interactive-file' %}"><h5 class="set-inline">Semantic Network Analysis</h5> <span class="badge badge-pill badge-danger">Interactive</span></a>
74+
<a class="btn btn-lg btn-outline-dark" href="{% url 'viz:wc-file' %}"><h5 class="set-inline">Word Cloud</h5> <span class="badge badge-pill badge-warning">Simple Image</span></a>
7575
</div>
7676
</div>
7777
</div>

app/templates/viz/show_result/sna_interactive.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ <h3 class="alert-heading">Data Error</h3>
113113
<p>If you see this page, it will be in one of the following cases.</p>
114114
<hr>
115115
<p class="mb-2">- The amount of data entered is so small that it can not be analyzed.</p>
116-
<p class="mb-2">- The value of Edge Remove Threshold is too high. Edge Remove Threshold should be a reasonable value for the amount of data.</p>
116+
<p class="mb-2">- The value of Edge Remove Threshold is too high. It should be a reasonable value for the amount of data.</p>
117117
</div>
118-
<a href="{% if mode_file %}{% url 'viz:sna_file' %}{% else %}{% url 'viz:sna' %}{% endif %}" class="btn btn-danger btn-lg btn-block">Back To Configuration</a>
118+
<a href="{% if mode_file %}{% url 'viz:sna-interactive-file' %}{% else %}{% url 'viz:sna-interactive' %}{% endif %}" class="btn btn-danger btn-lg btn-block">Back To Configuration</a>
119119
</div>
120120

121121
<div class="block-content"></div>

app/templates/viz/show_result/wc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="text-center">
88
<img src="{% url 'viz:wc_result' %}" alt="WC Result Image">
99
</div>
10-
<a href="{% if mode_file %}{% url 'viz:wc_file' %}{% else %}{% url 'viz:wc' %}{% endif %}" class="btn btn-info btn-lg btn-block border-radius-0">Back To Configuration</a>
10+
<a href="{% if mode_file %}{% url 'viz:wc-file' %}{% else %}{% url 'viz:wc' %}{% endif %}" class="btn btn-info btn-lg btn-block border-radius-0">Back To Configuration</a>
1111

1212
{% else %}
1313

@@ -18,7 +18,7 @@ <h3 class="alert-heading">Data Error</h3>
1818
<hr>
1919
<p class="mb-2">- The amount of data entered is so small that it can not be analyzed.</p>
2020
</div>
21-
<a href="{% if mode_file %}{% url 'viz:wc_file' %}{% else %}{% url 'viz:wc' %}{% endif %}" class="btn btn-danger btn-lg btn-block">Back To Configuration</a>
21+
<a href="{% if mode_file %}{% url 'viz:wc-file' %}{% else %}{% url 'viz:wc' %}{% endif %}" class="btn btn-danger btn-lg btn-block">Back To Configuration</a>
2222
</div>
2323

2424
<div class="block-content"></div>

app/viz/core/sna_sub.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ def get_sub_data(graph, node_num, edge_remove_threshold, remove_isolated_node, m
160160
sub_nodes.append(node_data[0])
161161

162162
sub_graph = graph.subgraph(sub_nodes)
163+
164+
# Exception Handling : If No Edges or No Nodes
165+
if not sub_graph.edges or not sub_graph.nodes:
166+
raise ValueError()
167+
163168
result = {
164169
'sub_graph': sub_graph,
165170
'tf_sum_dict': tf_sum_dict,

app/viz/urls.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
app_name = 'viz'
55

66
urlpatterns = [
7-
path('sna_interactive/', views.sna_interactive, name='sna_interactive'),
8-
path('sna_interactive_file/', views.sna_interactive_file, name='sna_interactive_file'),
9-
path('sna_gexf/', views.get_gexf, name='get_gexf'),
7+
path('sna_interactive/', views.sna_interactive, name='sna-interactive'),
8+
path('sna_interactive_file/', views.sna_interactive_file, name='sna-interactive-file'),
9+
path('sna_gexf/', views.get_gexf, name='get-gexf'),
1010
path('wc/', views.wc, name='wc'),
11-
path('wc_file/', views.wc_file, name='wc_file'),
12-
path('wc_result/', views.wc_result, name='wc_result'),
11+
path('wc_file/', views.wc_file, name='wc-file'),
12+
path('wc_result/', views.wc_result, name='wc-result'),
1313
]

app/viz/views.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ def sna_interactive(request):
2525
'theme': theme,
2626
'value_error': value_error,
2727
'footer_sticky': footer_sticky,
28-
'partition_data': partition_data,
2928
}
29+
if not value_error:
30+
context['partition_data'] = partition_data
3031
return render(request, 'viz/show_result/sna_interactive.html', context)
3132
else:
3233
form = forms.SnaInteractiveForm()
@@ -73,8 +74,9 @@ def sna_interactive_file(request):
7374
'theme': theme,
7475
'value_error': value_error,
7576
'footer_sticky': footer_sticky,
76-
'partition_data': partition_data,
7777
}
78+
if not value_error:
79+
context['partition_data'] = partition_data
7880
return render(request, 'viz/show_result/sna_interactive.html', context)
7981
else:
8082
form = forms.SnaInteractiveFileForm()

0 commit comments

Comments
 (0)