Produced by Araxis Merge on 3/25/2019 8:58:08 AM Central Daylight 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.
# | Location | File | Last Modified |
---|---|---|---|
1 | C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource | VistaImagingExternalPackageDataSourceService.java | Mon Mar 18 20:39:06 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource | VistaImagingExternalPackageDataSourceService.java | Tue Mar 19 12:04:24 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 274 |
Changed | 2 | 4 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
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 |
No regular expressions were active.
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: May 26, 2009 | |
6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
7 | Developer: DNS 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 gov .va.med.Ro utingToken ; | |
29 | import gov .va.med.im aging.arti factsource .ResolvedA rtifactSou rce; | |
30 | import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on; | |
31 | import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception; | |
32 | import gov .va.med.im aging.exch ange.busin ess.Study; | |
33 | import gov .va.med.im aging.exch ange.busin ess.WorkIt em; | |
34 | import gov .va.med.im aging.exch ange.enums .StudyDele tedImageSt ate; | |
35 | import gov .va.med.im aging.exch ange.enums .StudyLoad Level; | |
36 | import gov .va.med.im aging.prot ocol.vista .VistaImag ingTransla tor; | |
37 | import gov .va.med.im aging.url. vista.Vist aQuery; | |
38 | import gov .va.med.im aging.url. vista.exce ptions.Inv alidVistaC redentials Exception; | |
39 | import gov .va.med.im aging.url. vista.exce ptions.Vis taMethodEx ception; | |
40 | import gov .va.med.im aging.vist adatasourc e.session. VistaSessi on; | |
41 | import gov .va.med.im aging.vist aimagingda tasource.c ommon.Vist aImagingCo mmonUtilit ies; | |
42 | ||
43 | import jav a.io.IOExc eption; | |
44 | import jav a.util.Has hMap; | |
45 | import jav a.util.Lis t; | |
46 | import jav a.util.Map ; | |
47 | import jav a.util.Sor tedSet; | |
48 | ||
49 | /** | |
50 | * This ve rsion uses patch 83 RPC calls to built a proper st udy/series /instance graph | |
51 | * | |
52 | * @author DNS werfej | |
53 | * | |
54 | */ | |
55 | public cla ss VistaIm agingExter nalPackage DataSource Service | |
56 | extends Ab stractBase VistaImagi ngExternal PackageDat aSourceSer vice | |
57 | { | |
58 | // The requi red versio n of VistA Imaging n eeded to e xecute the RPC calls for this operation | |
59 | pu blic final static St ring MAG_R EQUIRED_VE RSION = "3 .0P83"; | |
60 | ||
61 | /* * | |
62 | * @param re solvedArti factSource | |
63 | * @param pr otocol | |
64 | * / | |
65 | pu blic Vista ImagingExt ernalPacka geDataSour ceService( ResolvedAr tifactSour ce resolve dArtifactS ource, Str ing protoc ol) | |
66 | { | |
67 | supe r(resolved ArtifactSo urce, prot ocol); | |
68 | } | |
69 | ||
70 | /* (non-Java doc) | |
71 | * @see gov. va.med.ima ging.vista datasource .AbstractB aseVistaEx ternalPack ageDataSou rceService #getRequir edVistaIma gingVersio n() | |
72 | * / | |
73 | @O verride | |
74 | pr otected St ring getRe quiredVist aImagingVe rsion() | |
75 | { | |
76 | retu rn VistaIm agingCommo nUtilities .getVistaD ataSourceI magingVers ion( | |
77 | VistaIma gingDataSo urceProvid er.getVist aConfigura tion(), th is.getClas s(), | |
78 | MAG_REQU IRED_VERSI ON); | |
79 | } | |
80 | ||
81 | /* (non-Java doc) | |
82 | * @see gov. va.med.ima ging.vista datasource .AbstractB aseVistaEx ternalPack ageDataSou rceService #fullyPopu lateGroupI ntoStudy(g ov.va.med. imaging.ex change.bus iness.Stud y) | |
83 | * / | |
84 | @O verride | |
85 | pr otected St udy fullyP opulateGro upIntoStud y( | |
86 | Vist aSession v istaSessio n, | |
87 | Stud y study, | |
88 | Stri ng patient Dfn) | |
89 | th rows Inval idVistaCre dentialsEx ception, V istaMethod Exception, IOExcepti on | |
90 | { | |
91 | // C TB 29Nov20 09 | |
92 | //St ring study Ien = Base 32Conversi onUtility. base32Deco de(study.g etStudyIen ()); | |
93 | Stri ng studyIe n = study. getStudyIe n(); | |
94 | Map< String, St ring> stud yMap = new HashMap<S tring, Str ing>(); | |
95 | stud yMap.put(" " + studyM ap.size(), studyIen) ; | |
96 | ||
97 | Vist aQuery que ry = | |
98 | VistaI magingQuer yFactory.c reateGetSt udiesByIen VistaQuery (studyMap, patientDf n, StudyLo adLevel.FU LL); | |
99 | ||
100 | getL ogger().in fo("Making RPC call to get stu dy graph f or single group [" + studyIen + "]"); | |
101 | Stri ng vistaRe sponse = v istaSessio n.call(que ry); | |
102 | getL ogger().in fo("RPC ca ll complet e, receive d '" + vis taResponse .length() + "' bytes "); | |
103 | Stud yDeletedIm ageState s tudyDelete dImageStat e = | |
104 | (canRe trieveDele tedImages( ) ? StudyD eletedImag eState.doe sNotInclud eDeletedIm ages : Stu dyDeletedI mageState. cannotIncl udeDeleted Images); | |
105 | Sort edSet<Stud y> studies = | |
106 | VistaI magingTran slator.cre ateStudies FromGraph( getSite(), vistaResp onse, Stud yLoadLevel .FULL, | |
107 | studyDelet edImageSta te); | |
108 | ||
109 | retu rn VistaIm agingCommo nUtilities .mergeStud yWithStudy (vistaSess ion, studi es.first() , study, S tudyLoadLe vel.FULL); | |
110 | } | |
111 | ||
112 | /* * | |
113 | * Determine s if this data sourc e can hand le retriev ing delete d images i f the user requests them | |
114 | * @return | |
115 | * / | |
116 | pr otected bo olean canR etrieveDel etedImages () | |
117 | { | |
118 | retu rn false; | |
119 | } | |
120 | ||
121 | @O verride | |
122 | pr otected St ring getDa taSourceVe rsion() | |
123 | { | |
124 | retu rn "1"; | |
125 | } | |
126 | ||
127 | ||
128 | @O verride | |
129 | pu blic List< WorkItem> getRemoteW orkItemLis tFromDataS ource(Rout ingToken g lobalRouti ngToken, S tring idTy pe, | |
130 | String patientId , String c ptCode) th rows Metho dException , Connecti onExceptio n { | |
131 | retu rn null; | |
132 | } | |
133 | ||
134 | @O verride | |
135 | pu blic boole an deleteR emoteWorkI temFromDat aSource(Ro utingToken globalRou tingToken, String id ) | |
136 | throws MethodExc eption, Co nnectionEx ception { | |
137 | retu rn false; | |
138 | } | |
139 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.