Merge branch 'release/jakarta' into build/jakarta/2020.330

Author: gempa-jabe

CHANGELOG.md

@@ -10,6 +10,10 @@
 
   * Fix crash at start
 
+* fdsnws
+
+  * Fix fdsnws/event event type and evaluation mode filter
+
 ## Release 2020.330
 
 ```SC_API_VERSION 13.0.0```

CMakeLists.txt

@@ -48,6 +48,10 @@ ENDIF (SC_GLOBAL_PYTHON_WRAPPER)
 SET(PYTHON_LIBRARY_SUFFIX /python)
 SET(PYTHON_LIBRARY_PATH lib${PYTHON_LIBRARY_SUFFIX})
 
+IF(SC_GLOBAL_PYTHON_WRAPPER_NUMPY)
+	FIND_PACKAGE(Numpy)
+ENDIF()
+
 OPTION(SC_GLOBAL_GUI "Build graphical user interfaces (requires Qt4 or Qt5)" ON)
 OPTION(SC_GLOBAL_GUI_QT5 "Build graphical user interfaces for Qt5" ON)
 

src/trunk/apps/fdsnws/fdsnws.py

@@ -592,7 +592,7 @@ def initConfiguration(self):
                                   "list takes precedence" % overlapCount,
                                   file=sys.stderr)
                 except Exception as e:
-                    print("error parsing eventType.whitelist: %s" % str(e),
+                    print("error parsing eventType.blacklist: %s" % str(e),
                           file=sys.stderr)
                     return False
         except Exception:
@@ -942,7 +942,7 @@ def _site(self):
 
             # query
             event1.putChild(b'query', FDSNEvent(
-                self._hideAuthor, self._evaluationMode,
+                self._hideAuthor, self._hideComments, self._evaluationMode,
                 self._eventTypeWhitelist, self._eventTypeBlacklist,
                 self._eventFormats))
 

src/trunk/libs/swig/CMakeLists.txt

@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(../../../system/libs/swig)