kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Compare commits

base: kasper:feature/docker-nginx
Branches Tags
kasper:main kasper:develop kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222
...
compare: kasper:release/v1.0
Branches Tags
kasper:develop kasper:main kasper:feature/vagrant kasper:feature/mapquest kasper:feature/docker-nginx kasper:feature/topplus kasper:support/iframe
kasper:v1.1 kasper:release/v1.2 kasper:release/v1.1 kasper:release/v1.0 kasper:release/r20211017.2 kasper:release/r20211017.1 kasper:release/r20211017 kasper:release/r20200714 kasper:release/r20131023 kasper:release/r20140505 kasper:release/r20130222

6 Commits
feature/do ... release/v1

Author SHA1 Message Date
Kasper D. Fischer
86a65108cc Merge branch 'release/v1.0' into main 2021-10-27 10:30:48 +02:00
Kasper D. Fischer
95fb75ef14 set version to "v1.0 (2021-10-27)" 2021-10-27 10:30:22 +02:00
Kasper D. Fischer
af7c6642ff prepared version placeholder 
placeholder is "VVVVV"
use patchVersion.sh to replace version for new release. Do not use this script in develop branch.
 2021-10-27 10:27:32 +02:00
Kasper D. Fischer
8b2b58be05 removed -x option from shebang 2021-10-27 10:02:12 +02:00
Kasper D. Fischer
5455f182d7 adding script to patch version strings 
version strings are "VVVVV"
 2021-10-26 23:28:42 +02:00
Kasper D. Fischer
a91616d003 Merge branch 'hotfix/r20211017.2' into main 2021-10-17 15:47:16 +02:00
18 changed files with 38 additions and 17 deletions
Expand all files Collapse all files

1
Dockerfile
View File

@@ -1,3 +1,4 @@
# Version: v1.0 (2021-10-27)
FROM nginx:alpine FROM nginx:alpine
# set labels # set labels

1
nginx/default.conf
View File

@@ -1,3 +1,4 @@
# Version: v1.0 (2021-10-27)
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;

2
nginx/nginx.conf
View File

@@ -1,4 +1,4 @@
# Version: v1.0 (2021-10-27)
user nginx; user nginx;
worker_processes 1; worker_processes 1;

1
scripts/fetchEvents.sh
View File

@@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
# Version: v1.0 (2021-10-27)
# get starting date # get starting date
# find gdate or date command ( OSX: brew install coreutils) # find gdate or date command ( OSX: brew install coreutils)

4
scripts/mkGeolocationTable.py
View File

@@ -12,6 +12,8 @@
AJAX calls to the Nominatim service small, e. g. : AJAX calls to the Nominatim service small, e. g. :
curl -s "https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js curl -s "https://fdsnws.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js
Version: v1.0 (2021-10-27)
License License
Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de> Copyright 2020-2021 Kasper D. Fischer <kasper.fischer@rub.de>
@@ -123,7 +125,7 @@ if __name__ == "__main__":
# parse arguments # parse arguments
import argparse import argparse
versionText = 'r20211017 (2021-10-17)' versionText = 'v1.0 (2021-10-27)'
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Reverse geocoding lookup of events in xml format (stdin).', description='Reverse geocoding lookup of events in xml format (stdin).',
epilog=versionText) epilog=versionText)

17
scripts/patchVersion.sh Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/bash
# version: v1.0 (2021-10-27)
if [ $# -le 1 ] ; then
echo usage: ${0} version_string files ...
exit 0
fi
version="$1"
shift
files="$*"
echo ${version} ${files}
which sponge > /dev/null || ( echo "sponge util must be installed" ; exit 0 )
for file in ${files}; do
sed "s/V\{5\}/${version}"/ ${file} | sponge ${file}
done

6
wsgi/plotFDSN.py
View File

@@ -4,8 +4,7 @@
Get waveform data from FDSN web service and create a fancy plot Get waveform data from FDSN web service and create a fancy plot
This programme runs as a script or as a WSGI application. This programme runs as a script or as a WSGI application.
Subversion information: :version v1.0 (2021-10-27)
$Id$
:license :license
Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de> Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de>
@@ -379,8 +378,7 @@ if __name__ == "__main__":
epilog=u'$Revision$ ($Date$, $Author$)'.replace( epilog=u'$Revision$ ($Date$, $Author$)'.replace(
"$", "")) "$", ""))
parser.add_argument(u'-v', u'-V', u'--version', action='version', parser.add_argument(u'-v', u'-V', u'--version', action='version',
version=u'$Revision$ ($Date$, \ version=u'v1.0 (2021-10-27)')
$Author$)'.replace('$', ''))
parser.add_argument(u'-u', u'--url', action='store', dest='server', parser.add_argument(u'-u', u'--url', action='store', dest='server',
default=u'https://ariadne.geophysik.ruhr-uni-bochum.de', default=u'https://ariadne.geophysik.ruhr-uni-bochum.de',
help=u'Base URL of the FDSN web service (https://ariadne.geophysik.ruhr-uni-bochum.de).') help=u'Base URL of the FDSN web service (https://ariadne.geophysik.ruhr-uni-bochum.de).')

2
wsgi/showEnv.py
View File

@@ -7,6 +7,8 @@ def application(environ, start_response):
:type start_response: function :type start_response: function
:return: response to be sent to the client by the wsgi server :return: response to be sent to the client by the wsgi server
:rtype: list :rtype: list
:version: v1.0 (2021-10-27)
""" """
from cgi import FieldStorage from cgi import FieldStorage

3
wsgi/traceDayplot.py
View File

@@ -3,8 +3,7 @@
""" """
Produce a dayplot from seismogram recordings Produce a dayplot from seismogram recordings
Subversion information: version: v1.0 (2021-10-27)
$Id$
license: gpl3 license: gpl3
Copyright 2012-2020 Seismological Observatory, Ruhr-University Bochum Copyright 2012-2020 Seismological Observatory, Ruhr-University Bochum

2
www/events.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017.2 (2021-10-17) Version v1.0 (2021-10-27)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */

2
www/events.js.en
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017.2 (2021-10-17) Version v1.0 (2021-10-27)
*/ */
/* adding row(s) to a table and format date strings afterwards */ /* adding row(s) to a table and format date strings afterwards */

2
www/index.html.de
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- Version VVVVV --> <!-- Version v1.0 (2021-10-27) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />

2
www/index.html.en
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<!-- Version VVVVV --> <!-- Version v1.0 (2021-10-27) -->
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'> <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />

2
www/map.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version VVVVV Version v1.0 (2021-10-27)
*/ */
/* add station marker */ /* add station marker */

2
www/map.js.en
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see https://www.gnu.org/licenses/. with this program. If not, see https://www.gnu.org/licenses/.
Version VVVVV Version v1.0 (2021-10-27)
*/ */
/* add station marker */ /* add station marker */

2
www/misc.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version VVVVV Version v1.0 (2021-10-27)
*/ */
/* calculate marker radius from magnitude /* calculate marker radius from magnitude

2
www/stations.js
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017.2 (2021-10-17) Version v1.0 (2021-10-27)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */

2
www/stations.js.en
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/. with this program. If not, see http://www.gnu.org/licenses/.
Version r20211017.2 (2021-10-17) Version v1.0 (2021-10-27)
*/ */
/* Load the stations using ajax */ /* Load the stations using ajax */