Skip to content

Commit ba71540

Browse files
valentinedwvvalentinedwv
committed
1 parent 59a0be3 commit ba71540

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

‎wof/flask/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def index():
3838
rest10=path+'/rest_1_0/',
3939
rest11=path+'/rest_1_1/',
4040
rest2=path+'/rest_2/',
41-
soap10=path+'/soap/cuahsi_1_0/.wsdl',
42-
soap11=path+'/soap/cuahsi_1_1/.wsdl',
41+
soap10=path+'/soap/cuahsi_1_0/',
42+
soap11=path+'/soap/cuahsi_1_1/',
4343
p=wof_inst.network)
4444

4545
app.add_url_rule(servicesPath+'/', wof_inst.network+'index', index)

‎wof/flask/templates/index.html

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,54 @@
1414
</head>
1515
<body>
1616
<p>Visit one of these pages to obtain {{p}} observations data and metadata from the REST/SOAP APIs for WOF written in Python.<br>
17-
In HIS central, instead of getting WSDL location URLs, some clients use the service location endpoints for SOAP services.</p>
18-
<table style="width: 750px;">
17+
18+
19+
<p>CUAHSI WaterOneFlow is defined as a SOAP service sending WaterML v1.x messages. Many clients only utilize
20+
the service location, or make assumptions about it's implementation.
21+
In these cases (like HIS central), use the Service location endpoint URL.</p>
22+
</p><table style="width: 750px;">
1923
<tr>
24+
<th>Service</th>
2025
<th>WSDL's location URL</th>
2126
<th>Service location endpoint URL</th>
2227
</tr>
2328
<tr>
24-
<td>http://127.0.0.1:8080/{network}/soap/cuahsi_1_0/.wsdl</td>
25-
<td>http://127.0.0.1:8080/{network}/soap/cuahsi_1_0/</td>
29+
<td>SOAP service -- WaterML 1.0</td>
30+
<td><a href="{{request.script_root|safe}}/{{ soap10 }}.wsdl">
31+
{{request.url_root|safe}}{{ soap10 }}.wsdl
32+
</a> </td>
33+
<td><a href="{{request.script_root|safe}}/{{ soap10 }}">
34+
{{request.url_root|safe}}{{ soap10 }} </a> </td>
2635
</tr>
2736
<tr>
28-
<td>http://127.0.0.1:8080/{network}/soap/cuahsi_1_1/.wsdl</td>
29-
<td>http://127.0.0.1:8080/{network}/soap/cuahsi_1_1/</td>
37+
<td>SOAP service -- WaterML 1.1</td>
38+
<td><a href="{{request.script_root|safe}}/{{ soap11 }}.wsdl">
39+
{{request.url_root|safe}}{{ soap11 }}.wsdl
40+
</a></td>
41+
<td><a href="{{request.script_root|safe}}/{{ soap11 }}">
42+
{{request.url_root|safe}}{{ soap11 }} </a> </td>
3043
</tr>
3144
</table>
45+
<p> You can test SOAP services with clients websites like <a href="http://www.service-repository.com/client/start">www.service-repository.com</a> or applications like SOAPUI. Example SoapUI projects are found in the <a href='https://github.com/ODM2/WOFpy/tree/master/test'>test directory</a> of WOFPy github repository </p>
46+
<p> WOF Py also includes REST interfaces that respond with WaterML 1.x documents.</p>
3247
<ul>
3348
<li>
3449
<a href="{{request.script_root|safe}}/{{ rest10 }}">
3550
REST Service -- WaterML 1.0
3651
</a>
3752
</li>
3853
<li>
39-
<a href="{{request.script_root|safe}}/{{ soap10 }}">
40-
SOAP service -- WaterML 1.0
41-
</a>
42-
</li>
43-
<li>
4454
<a href="{{request.script_root|safe}}/{{ rest11 }}">
4555
REST service -- WaterML 1.1
4656
</a>
4757
</li>
48-
<li>
49-
<a href="{{request.script_root|safe}}/{{ soap11 }}">
50-
SOAP service -- WaterML 1.1
51-
</a>
52-
</li>
58+
5359
<li>
5460
<a href="{{request.script_root|safe}}/{{ rest2 }}">
5561
WaterML 2
5662
</a>
5763
</li>
5864
</ul>
59-
6065
</body>
6166

6267
</html>

0 commit comments

Comments
 (0)