diff --git a/LICENSE.rst b/LICENSE.rst index cb49b365b93760eb1a3e3abe437b6c44bcb45a0b..0a02d7994ed6406217d81b228b159581e06baeac 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,4 +1,4 @@ -Copyright (c) 2009-2014 by Leiden University Medical Center and contributors +Copyright (c) 2009-2015 by Leiden University Medical Center and contributors (see the AUTHORS.rst file for details). The Mutalyzer source code is licensed under the `GNU Affero General Public diff --git a/README.rst b/README.rst index 1f601c6cf32a536c6d7336dcab73a596e015ff7b..996520f0d1b277372126fef3816acc1961dabb86 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ Please refer to the documentation for `more information on contributions Copyright --------- -Mutalyzer is copyright (c) 2009-2014 by Leiden University Medical Center and +Mutalyzer is copyright (c) 2009-2015 by Leiden University Medical Center and contributors (see the AUTHORS.rst file for details). Mutalyzer is licensed under the `GNU Affero General Public License diff --git a/mutalyzer/services/rpc.py b/mutalyzer/services/rpc.py index 3e3264175fa083ce1b1490c30e11c3fb774705fb..6fce0a8faed1640b1882a31528973aaf0e5b1fcb 100644 --- a/mutalyzer/services/rpc.py +++ b/mutalyzer/services/rpc.py @@ -1240,6 +1240,8 @@ class MutalyzerService(ServiceBase): output.addMessage(__file__, -1, 'INFO', 'Received request descriptionExtract') + stats.increment_counter('description-extractor/webservice') + if not settings.TESTING and (len(reference) > 1000 or len(observed) > 1000): raise Fault('EMAXSIZE', diff --git a/mutalyzer/website/templates/about.html b/mutalyzer/website/templates/about.html index c8ddf49fb25c29424246c0b6c610562b6513839d..d6ef86be82847dd03cbd1a52a1daa92c123d63c5 100644 --- a/mutalyzer/website/templates/about.html +++ b/mutalyzer/website/templates/about.html @@ -175,13 +175,13 @@ always be compared directly. </tr> <tr> <th class="text-right">Website</th> - <th class="text-right">Webservice</th> - <th class="text-right">Batch job</th> + <th class="text-right"><a href="{{ url_for('.webservices') }}">Webservice</a></th> + <th class="text-right"><a href="{{ url_for('.batch_jobs') }}">Batch job</th> </tr> </thead> <tbody> <tr> - <td>Syntax checker</td> + <td><a href="{{ url_for('.syntax_checker') }}">Syntax checker</a></td> <td class="text-right">{{ '{0:,}'.format(counter_totals['syntax-checker/website']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['syntax-checker/webservice']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['syntax-checker/batch']|d(0)) }}</td> @@ -190,7 +190,7 @@ always be compared directly. counter_totals['syntax-checker/batch']|d(0)) }}</td> </tr> <tr> - <td>Name checker</td> + <td><a href="{{ url_for('.name_checker') }}">Name checker</a></td> <td class="text-right">{{ '{0:,}'.format(counter_totals['name-checker/website']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['name-checker/webservice']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['name-checker/batch']|d(0)) }}</td> @@ -199,7 +199,15 @@ always be compared directly. counter_totals['name-checker/batch']|d(0)) }}</td> </tr> <tr> - <td>Position converter</td> + <td><a href="{{ url_for('.description_extractor') }}">Description extractor</a></td> + <td class="text-right">{{ '{0:,}'.format(counter_totals['description-extractor/website']|d(0)) }}</td> + <td class="text-right">{{ '{0:,}'.format(counter_totals['description-extractor/webservice']|d(0)) }}</td> + <td class="text-right">N/A</td> + <td class="text-right">{{ '{0:,}'.format(counter_totals['description-extractor/website']|d(0) + + counter_totals['description-extractor/webservice']|d(0)) }}</td> + </tr> + <tr> + <td><a href="{{ url_for('.position_converter') }}">Position converter</a></td> <td class="text-right">{{ '{0:,}'.format(counter_totals['position-converter/website']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['position-converter/webservice']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['position-converter/batch']|d(0)) }}</td> @@ -208,7 +216,7 @@ always be compared directly. counter_totals['position-converter/batch']|d(0)) }}</td> </tr> <tr> - <td>SNP converter</td> + <td><a href="{{ url_for('.snp_converter') }}">SNP converter</a></td> <td class="text-right">{{ '{0:,}'.format(counter_totals['snp-converter/website']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['snp-converter/webservice']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['snp-converter/batch']|d(0)) }}</td> @@ -217,7 +225,7 @@ always be compared directly. counter_totals['snp-converter/batch']|d(0)) }}</td> </tr> <tr> - <td>Batch jobs</td> + <td><a href="{{ url_for('.batch_jobs') }}">Batch jobs</a></td> <td class="text-right">{{ '{0:,}'.format(counter_totals['batch-job/website']|d(0)) }}</td> <td class="text-right">{{ '{0:,}'.format(counter_totals['batch-job/webservice']|d(0)) }}</td> <td class="text-right">N/A</td> diff --git a/mutalyzer/website/templates/base.html b/mutalyzer/website/templates/base.html index d2545f3bb7e2f70a061995d3af61b98800b4f317..6021bd1716fb3e903a1f4206c325dda91ec286ae 100644 --- a/mutalyzer/website/templates/base.html +++ b/mutalyzer/website/templates/base.html @@ -182,7 +182,7 @@ </div> <div class="col-md-4"> <img src="{{ url_for('static', filename='images/LUMC_24x24.png') }}" align="middle"> - <p>© 2009-2014 <a href="http://www.lumc.nl" target="new">LUMC</a></p> + <p>© {{ copyright_years[0] }}-{{ copyright_years[1] }} <a href="http://www.lumc.nl" target="new">LUMC</a></p> </div> </footer> diff --git a/mutalyzer/website/views.py b/mutalyzer/website/views.py index fffb8bb68e4c3ac1c6a2cdfc41ba61e0349c02f4..570f40faeb8147d33c04ab6030a0963f82a63686 100644 --- a/mutalyzer/website/views.py +++ b/mutalyzer/website/views.py @@ -718,6 +718,7 @@ def description_extractor_submit(): output.addMessage(__file__, -1, 'INFO', 'Received Description Extract request from %s' % request.remote_addr) + stats.increment_counter('description-extractor/website') r = s = '' reference_method = request.form.get('reference_method')