Andreas Tille pushed to branch upstream at Debian Med / gnumed-server
Commits: f301a928 by Andreas Tille at 2020-11-12T17:07:07+01:00 New upstream version 22.14 - - - - - 7 changed files: - server/bootstrap/bootstrap_gm_db_system.py - server/doc/schema/gnumed-entire_schema.html - server/pycommon/gmMimeMagic.py - server/pycommon/gmPG2.py - server/pycommon/gmScriptingListener.py - server/pycommon/gmTools.py - server/sql/v21-v22/fixups/v22-release_notes-fixup.sql Changes: ===================================== server/bootstrap/bootstrap_gm_db_system.py ===================================== @@ -773,11 +773,11 @@ class database: curs.execute("alter database %s set track_commit_timestamp to on" % self.name) except: _log.exception(u'PostgreSQL version < 9.5 does not support <track_commit_timestamp> OR <track_commit_timestamp> cannot be set at runtime') + curs.close() self.conn.commit() - curs = self.conn.cursor() - gmPG2.log_pg_settings(curs = curs) + gmConnectionPool.log_pg_settings(curs = curs) curs.close() self.conn.commit() @@ -856,7 +856,7 @@ class database: cursor.execute(cmd) except: _log.exception(u">>>[%s]<<< failed" % cmd) - _log.debug(u'conn state after failed DROP: %s', gmPG2.capture_conn_state(self.conn)) + _log.debug(u'conn state after failed DROP: %s', gmConnectionPool.log_conn_state(self.conn)) return False finally: cursor.close() ===================================== server/doc/schema/gnumed-entire_schema.html ===================================== @@ -112,7 +112,7 @@ <body> <!-- Primary Index --> - <p><br><br>Dumped on 2020-07-23</p> + <p><br><br>Dumped on 2020-11-09</p> <h1><a name="index">Index of database - gnumed_v22</a></h1> <ul> @@ -125987,7 +125987,7 @@ DECLARE _lang ALIAS FOR $1; BEGIN raise notice 'Forcing current language to [%] without checking for translations..', _lang; - delete from i18n.curr_lang where user = SESSION_USER; + delete from i18n.curr_lang where db_user = SESSION_USER; insert into i18n.curr_lang (lang, db_user) values (_lang, SESSION_USER); return true; END; @@ -126055,14 +126055,14 @@ END; <h3>Returns: boolean</h3> <h3>Language: PLPGSQL</h3> <p>set preferred language: - - for "current user" + - for "current (session) user" - only if translations for this language are available</p> <pre> DECLARE _lang ALIAS FOR $1; BEGIN if exists(select pk from i18n.translations where lang = _lang) then - delete from i18n.curr_lang where user = SESSION_USER; + delete from i18n.curr_lang where db_user = SESSION_USER; insert into i18n.curr_lang (lang, db_user) values (_lang, SESSION_USER); return true; end if; ===================================== server/pycommon/gmMimeMagic.py ===================================== The diff for this file was not included because it is too large. ===================================== server/pycommon/gmPG2.py ===================================== @@ -2096,7 +2096,6 @@ def sanity_check_database_settings(): #======================================================================= # main #----------------------------------------------------------------------- -log_pg_settings = gmConnectionPool.log_pg_settings log_pg_exception_details = gmConnectionPool.log_pg_exception_details exception_is_connection_loss = gmConnectionPool.exception_is_connection_loss ===================================== server/pycommon/gmScriptingListener.py ===================================== @@ -3,7 +3,6 @@ This module implements threaded listening for scripting. """ #===================================================================== -__version__ = "$Revision: 1.7 $" __author__ = "K.Hilbert <karsten.hilb...@gmx.net>" import sys, time, threading, select, logging @@ -76,7 +75,7 @@ class cScriptingListener: except Exception: pass except Exception: - print sys.exc_info() + print(sys.exc_info()) self._thread = None @@ -146,7 +145,7 @@ if __name__ == "__main__": s = xmlrpclib.client.ServerProxy('http://localhost:9999') try: t = s.tell_time() - print t + print(t) except Exception: _log.exception('cannot interact with server') ===================================== server/pycommon/gmTools.py ===================================== @@ -958,7 +958,7 @@ def coalesce(value2test=None, return_instead=None, template4value=None, template value = (template4instead % return_instead) or return_instead else: value = (template4value % value2test) or value2test - print value + print(value) @param value2test: the value to be tested for <None> ===================================== server/sql/v21-v22/fixups/v22-release_notes-fixup.sql ===================================== @@ -17,28 +17,22 @@ INSERT INTO dem.message_inbox ( ) VALUES ( (select pk from dem.staff where db_user = 'any-doc'), (select pk_type from dem.v_inbox_item_type where type = 'memo' and category = 'administrative'), - 'Release Notes for GNUmed 1.8.3 (database v22.13)', - 'GNUmed 1.8.3 Release Notes: + 'Release Notes for GNUmed 1.8.4 (database v22.14)', + 'GNUmed 1.8.4 Release Notes: - 1.8.3 + 1.8.4 -NEW: tool: fingerprint_db +IMPROVED: exceptions: always include exception/traceback in mail +IMPROVED: PACS: robustify DICOM upload -IMPROVED: forms: log pdflatex version +FIX: placeholders: exception on parsing some option styles +FIX: address: nominatim.openstreetmap.org API has changed +FIX: documents: properly wipe details display between patients -FIX: meds: drug data source selection [thanks bganglia892] -FIX: meds: ADR URL configuration [thanks bganglia892] -FIX: vaccs: ADR URL configuration [thanks bganglia892] -FIX: tests: LOINC import fixup [thanks bganglia892] -FIX: db: whitespace in connection parameters [thanks kikiruz] -FIX: startup: startup without console fails [thanks Marc] -FIX: top panel: incorrect age-at-birthday display -FIX: i18n: locale activation + 22.14 - 22.13 - -IMPROVED: bootstrapper logging +FIX: bootstrapper exception calling capture_conn_state() '); -- -------------------------------------------------------------- -select gm.log_script_insertion('v22-release_notes-fixup.sql', '22.13@1.8.3'); +select gm.log_script_insertion('v22-release_notes-fixup.sql', '22.14@1.8.4'); View it on GitLab: https://salsa.debian.org/med-team/gnumed-server/-/commit/f301a9281f1e12e154acc523c27262fabf9f96b6 -- View it on GitLab: https://salsa.debian.org/med-team/gnumed-server/-/commit/f301a9281f1e12e154acc523c27262fabf9f96b6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit