398. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:50 PM Central Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

398.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource	VistaImagingPatientDataSourceServiceV2.java	Mon Dec 4 21:34:52 2017 UTC
2	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource	VistaImagingPatientDataSourceServiceV2.java	Mon Dec 4 22:06:51 2017 UTC

398.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	254
Changed	2	4
Inserted	0	0
Removed	0	0

398.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

398.4 Active regular expressions

No regular expressions were active.

398.5 Comparison detail

	1	/**
	2	*
	3	Package: MAG - Vis tA Imaging
	4	WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
	5	Date Cre ated: Jan 18, 2012
	6	Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD
	7	Developer: WERFEJ
	8	Descript ion:
	9
	10	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	11	;; Property of the US Government .
	12	;; No permis sion to co py or redi stribute t his softwa re is give n.
	13	;; Use of un released v ersions of this soft ware requi res the us er
	14	;; to execu te a writt en test ag reement wi th the Vis tA Imaging
	15	;; Developm ent Office of the De partment o f Veterans Affairs,
	16	;; telephon e (301) 73 4-0100.
	17	;;
	18	;; The Food and Drug A dministrat ion classi fies this software a s
	19	;; a Class I I medical device. A s such, it may not b e changed
	20	;; in any wa y. Modifi cations to this soft ware may r esult in a n
	21	;; adulterat ed medical device un der 21CFR8 20, the us e of which
	22	;; is consid ered to be a violati on of US F ederal Sta tutes.
	23	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	24
	25	*/
	26	package go v.va.med.i maging.vis taimagingd atasource;
	27
	28	import jav a.io.IOExc eption;
	29	import jav a.util.Lis t;
	30
	31	import org .apache.lo gging.log4 j.LogManag er;
	32	import org .apache.lo gging.log4 j.Logger;
	33
	34	import gov .va.med.Pa tientIdent ifier;
	35	import gov .va.med.Ro utingToken ;
	36	import gov .va.med.im aging.arti factsource .ResolvedA rtifactSou rce;
	37	import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on;
	38	import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception;
	39	import gov .va.med.im aging.core .interface s.exceptio ns.Patient NotFoundEx ception;
	40	import gov .va.med.im aging.data source.exc eptions.In validCrede ntialsExce ption;
	41	import gov .va.med.im aging.prot ocol.vista .VistaImag ingTransla tor;
	42	import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ;
	43	import gov .va.med.im aging.url. vista.Vist aQuery;
	44	import gov .va.med.im aging.url. vista.exce ptions.Inv alidVistaC redentials Exception;
	45	import gov .va.med.im aging.url. vista.exce ptions.Vis taMethodEx ception;
	46	import gov .va.med.im aging.vist adatasourc e.common.V istaCommon Utilities;
	47	import gov .va.med.im aging.vist adatasourc e.session. VistaSessi on;
	48	import gov .va.med.im aging.vist aimagingda tasource.c ommon.Vist aImagingCo mmonUtilit ies;
	49
	50	/**
	51	* @author WERFEJ
	52	*
	53	*/
	54	public cla ss VistaIm agingPatie ntDataSour ceServiceV 2
	55	extends Vi staImaging PatientDat aSourceSer vice
	56	{
	57	pu blic final static St ring MAG_R EQUIRED_VE RSION = "3 .0P122"; / / Patch 12 2 register s the MAGJ GET TREAT ING SITES rpc to MAG WINDOWS
	58	pr ivate fina l static L ogger logg er = LogMa nager.getL ogger(Vist aImagingPa tientDataS ourceServi ceV2.class );
	59
	60	pu blic Vista ImagingPat ientDataSo urceServic eV2(Resolv edArtifact Source res olvedArtif actSource, String pr otocol)
	61	{
	62	supe r(resolved ArtifactSo urce, prot ocol);
	63	}
	64
	65	@O verride
	66	pr otected St ring getRe quiredVist aImagingVe rsion()
	67	{
	68	retu rn VistaIm agingCommo nUtilities .getVistaD ataSourceI magingVers ion(
	69	VistaIma gingDataSo urceProvid er.getVist aConfigura tion(), th is.getClas s(),
	70	MAG_REQU IRED_VERSI ON);
	71	}
	72
	73	@O verride
	74	pu blic List< String> ge tTreatingS ites(Routi ngToken gl obalRoutin gToken,
	75	Patien tIdentifie r patientI dentifier, boolean i ncludeTrai lingCharac tersForSit e200)
	76	th rows Metho dException , Connecti onExceptio n
	77	{
	78	Vist aCommonUti lities.set DataSource MethodAndV ersion("ge tTreatingS ites", get DataSource Version()) ;
	79	logg er.info("g etTreating Sites(" + patientIde ntifier + ") Transac tionContex t (" + Tra nsactionCo ntextFacto ry.get().g etDisplayI dentity() + ").");
	80	Vist aSession l ocalVistaS ession = n ull;
	81	tr y
	82	{
	83	loca lVistaSess ion = getV istaSessio n();
	84	Stri ng patient Dfn = getP atientDfn( localVista Session, p atientIden tifier);
	85	Vist aQuery vm = VistaIma gingQueryF actory.cre ateMagJGet TreatingSi tesQuery(p atientDfn) ;
	86	Stri ng rtn = l ocalVistaS ession.cal l(vm);
	87	retu rn VistaIm agingTrans lator.conv ertTreatin gSiteListT oSiteNumbe rs(rtn, in cludeTrail ingCharact ersForSite 200);
	88	}
	89	ca tch (Vista MethodExce ption e)
	90	{
	91	logg er.error(" Error in g etTreating Sites", e) ;
	92	thro w new Meth odExceptio n(e.getMes sage());
	93	}
	94	ca tch (Inval idVistaCre dentialsEx ception e)
	95	{
	96	logg er.error(" Error in g etTreating Sites", e) ;
	97	thro w new Inva lidCredent ialsExcept ion(e.getM essage());
	98	}
	99	ca tch(Patien tNotFoundE xception p nfX)
	100	{
	101	logg er.error(" Patient no t found [" + patient Identifier + "]", pn fX);
	102	// J MW 12/14/2 010 - thro w the exce ption now
	103	// n ecessary s o we can p rovide the correct e rror for X CA request s
	104	thro w pnfX;
	105	// r eturn null ;
	106	// J MW 9/22/20 09
	107	// n ot really sure about this, was returning null but that creat ing incons istencies
	108	// w ith Federa tion which would ret urn an emp ty array l ist since the comman d
	109	// c onverts th e null to the array list, now doing that here inst ead to be
	110	// c onsistent. Might wa nt to thro w exceptio n or retur n null and handle
	111	// d ifferently to allow knowledge of the pat ient not f ound versu s having n ow sites.
	112	//re turn new A rrayList<S tring>(0);
	113	}
	114	ca tch(IOExce ption ioX)
	115	{
	116	logg er.error(" Exception getting Vi stA sessio n", ioX);
	117	thro w new Conn ectionExce ption(ioX) ;
	118	}
	119	fi nally
	120	{
	121	try{ localVista Session.cl ose();}cat ch(Throwab le t){}
	122	}
	123	}
	124
	125	pr otected St ring getDa taSourceVe rsion()
	126	{
	127	retu rn "2";
	128	}
	129	}