Commit 0cad4588 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 22.7

parent 23f40043

server/bootstrap/fixup_db-v22.conf

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ minimum postgresql version = 9.2 
schema base directory = ../sql/v21-v22/fixups/

schema = $schema$

v22-ref-paperwork_templates-fixups.sql

v22-invoice_id_grants-fixup.sql

v22-release_notes-fixup.sql

$schema$
@@ -60,6 +61,7 @@ script base directory = ../sql/v21-v22/python/ 
data import scripts = $data import scripts$

v22-import-form-templates.py

v22-2-fixup-form-templates.py

v22-import-plot-scripts.py

$data import scripts$



#----------------------------------

server/bootstrap/update_db-v21_v22.conf

+3 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ minimum postgresql version = 9.2 
schema base directory = ../sql/v21-v22/fixups/

schema = $schema$

v22-ref-paperwork_templates-fixups.sql

v22-invoice_id_grants-fixup.sql

v22-release_notes-fixup.sql

$schema$
@@ -198,6 +199,7 @@ script base directory = ../sql/v21-v22/python/ 
data import scripts = $data import scripts$

v22-import-form-templates.py

v22-2-fixup-form-templates.py

v22-import-plot-scripts.py

$data import scripts$
@@ -316,7 +318,7 @@ requests on results::::select count(1) from clin.test_result where fk_request is 
	select count(1) from clin.test_result where fk_request is not NULL

clinical code links (total) - internal consistency::::select True

	select ((select count(1) from clin.lnk_code2item_root) = (select ((select count(1) from clin.lnk_code2procedure) + (select count(1) from clin.lnk_code2rfe) + (select count(1) from clin.lnk_code2aoe) + (select count(1) from clin.lnk_code2episode) + (select count(1) from clin.lnk_code2h_issue) + (select count(1) from clin.lnk_code2narrative))))

paperwork templates::::select count(1) + 1 from ref.paperwork_templates

paperwork templates::::select count(1) + 2 from ref.paperwork_templates

	select count(1) from ref.paperwork_templates

automatic hints::::select count(1) from ref.auto_hint

	select count(1) - 1 from ref.auto_hint

server/doc/schema/gnumed-entire_schema.html

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
  <body>









    <!-- Primary Index -->









	<p><br><br>Dumped on 2019-07-28</p>









	<p><br><br>Dumped on 2019-09-13</p>









<h1><a name="index">Index of database - gnumed_v22</a></h1>









<ul>









    

























server/pycommon/gmLog2.py



+3
−3






























Original line number
Diff line number
Diff line







@@ -199,10 +199,10 @@ def log_stack_trace(message=None, t=None, v=None, tb=None):







	logger.debug(u'(locals by frame, outmost frame first)')









	for frame in stack_of_frames:









		logger.debug (









			u'>>> execution frame [%s] in [%s] at line %s <<<',









			u'--- frame [%s]: #%s, %s -------------------',









			frame.f_code.co_name,









			frame.f_code.co_filename,









			frame.f_lineno









			frame.f_lineno,









			frame.f_code.co_filename









		)









		for varname, value in frame.f_locals.items():









			if varname == u'__doc__':
































server/pycommon/gmPG2.py



+6
−4






























Original line number
Diff line number
Diff line







@@ -1580,6 +1580,8 @@ def sanitize_pg_regex(expression=None, escape_all=False):







			'.', '\.'









		).replace (









			'*', '\*'









		).replace (









			'?', '\?'









		)









		#']', '\]',			# not needed


















@@ -1835,17 +1837,17 @@ def run_rw_queries(link_obj=None, queries=None, end_tx=False, return_data=None,

















	<end_tx>









		- controls whether the transaction is finalized (eg.









		  committed/rolled back) or not, this allows the









		  COMMITted/ROLLed BACK) or not, this allows the









		  call to run_rw_queries() to be part of a framing









		  transaction









		- if link_obj is a connection then <end_tx> will









		- if link_obj is a *connection* then <end_tx> will









		  default to False unless it is explicitly set to









		  True which is taken to mean "yes, you do have full









		  control over the transaction" in which case the









		  transaction is properly finalized









		- if link_obj is a cursor we CANNOT finalize the









		- if link_obj is a *cursor* we CANNOT finalize the









		  transaction because we would need the connection for that









		- if link_obj is None <end_tx> will, of course, always be True









		- if link_obj is *None* <end_tx> will, of course, always be True



















	<return_data>









		- if true, the returned data will include the rows