Produced by Araxis Merge on 12/5/2017 12:06:42 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingBaseWebFacade\main\src\java\gov\va\med\imaging\wado | PhotoIdentificationServlet.java | Mon Dec 4 21:34:46 2017 UTC |
| 2 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingBaseWebFacade\main\src\java\gov\va\med\imaging\wado | PhotoIdentificationServlet.java | Mon Dec 4 22:01:22 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 228 |
| 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 | * Package : MAG - Vi stA Imagin g | |
| 3 | * WARNING : Per VHA Directive 2004-038, this routi ne should not be mod ified. | |
| 4 | * Date Cr eated: Apr 17, 2008 | |
| 5 | * Site Na me: Washi ngton OI F ield Offic e, Silver Spring, MD | |
| 6 | * @author
|
|
| 7 | * @versio n 1.0 | |
| 8 | * | |
| 9 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 10 | * Propert y of the U S Governme nt. | |
| 11 | * No perm ission to copy or re distribute this soft ware is gi ven. | |
| 12 | * Use of unreleased versions of this so ftware req uires the user | |
| 13 | * to exec ute a writ ten test a greement w ith the Vi stA Imagin g | |
| 14 | * Develop ment Offic e of the D epartment of Veteran s Affairs, | |
| 15 | * telepho ne (301) 7 34-0100. | |
| 16 | * | |
| 17 | * The Foo d and Drug Administr ation clas sifies thi s software as | |
| 18 | * a Class II medica l device. As such, it may not be change d | |
| 19 | * in any way. Modi fications to this so ftware may result in an | |
| 20 | * adulter ated medic al device under 21CF R820, the use of whi ch | |
| 21 | * is cons idered to be a viola tion of US Federal S tatutes. | |
| 22 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 23 | */ | |
| 24 | package go v.va.med.i maging.wad o; | |
| 25 | ||
| 26 | import gov .va.med.Pa tientIdent ifier; | |
| 27 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont ext; | |
| 28 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ; | |
| 29 | ||
| 30 | import jav a.io.IOExc eption; | |
| 31 | ||
| 32 | import jav ax.servlet .ServletEx ception; | |
| 33 | import jav ax.servlet .http.Http ServletReq uest; | |
| 34 | import jav ax.servlet .http.Http ServletRes ponse; | |
| 35 | ||
| 36 | import org .apache.lo gging.log4 j.LogManag er; | |
| 37 | import org .apache.lo gging.log4 j.Logger; | |
| 38 | ||
| 39 | /** | |
| 40 | * @author
|
|
| 41 | * @deprec ated JMW - I don't t hink this is used an ywhere, pr efer to ex tend Abstr actBasePho toIdImageS ervlet rat her than u se this on e | |
| 42 | * | |
| 43 | */ | |
| 44 | public cla ss PhotoId entificati onServlet | |
| 45 | extends Ab stractBase ImageServl et | |
| 46 | { | |
| 47 | pr ivate stat ic final l ong serial VersionUID = 1L; | |
| 48 | pr ivate Logg er logger = LogManag er.getLogg er(this.ge tClass()); | |
| 49 | ||
| 50 | /* * | |
| 51 | * | |
| 52 | * / | |
| 53 | pu blic Photo Identifica tionServle t() | |
| 54 | { | |
| 55 | } | |
| 56 | ||
| 57 | /* * | |
| 58 | * @see gov. va.med.ima ging.wado. AbstractBa seImageSer vlet#doGet (javax.ser vlet.http. HttpServle tRequest, javax.serv let.http.H ttpServlet Response) | |
| 59 | * / | |
| 60 | @O verride | |
| 61 | pr otected vo id doGet(H ttpServlet Request re q, HttpSer vletRespon se resp) | |
| 62 | th rows Servl etExceptio n, IOExcep tion | |
| 63 | { | |
| 64 | Tran sactionCon text trans actionCont ext = Tran sactionCon textFactor y.get(); | |
| 65 | Stri ng pathInf o = req.ge tPathInfo( ); | |
| 66 | if(p athInfo == null || p athInfo.is Empty()) | |
| 67 | { | |
| 68 | resp.s endError(H ttpServlet Response.S C_BAD_REQU EST, "The patient IC N was not specified in the URL and must be."); | |
| 69 | } | |
| 70 | else | |
| 71 | { | |
| 72 | pathIn fo = pathI nfo.substr ing(1); | |
| 73 | String [] resourc eIds = pat hInfo.spli t("/"); | |
| 74 | ||
| 75 | String siteNumbe r = null; | |
| 76 | String patientIc n = null; | |
| 77 | ||
| 78 | if(res ourceIds.l ength > 1) | |
| 79 | { | |
| 80 | siteNumb er = resou rceIds[0]; | |
| 81 | patientI cn = resou rceIds[1]; | |
| 82 | } | |
| 83 | else | |
| 84 | { | |
| 85 | siteNumb er = trans actionCont ext.getRea lm(); // default to our lo cal site n umber | |
| 86 | patientI cn = resou rceIds[0]; | |
| 87 | } | |
| 88 | logger .info("Get ting patie nt ID imag e '" + pat ientIcn + "' from si te '" + si teNumber + "'."); | |
| 89 | try | |
| 90 | { | |
| 91 | ||
| 92 | stream PatientIdI mageByPati entIcn(sit eNumber, | |
| 93 | PatientIde ntifier.ic nPatientId entifier(p atientIcn) , resp.get OutputStre am()); | |
| 94 | } | |
| 95 | catch (ImageServ letExcepti on isX) | |
| 96 | { | |
| 97 | resp.sen dError(isX .getRespon seCode(), isX.getMes sage()); | |
| 98 | } | |
| 99 | catch( Exception ex) | |
| 100 | { | |
| 101 | logger.e rror(ex.ge tMessage() , ex); | |
| 102 | resp.sen dError(Htt pServletRe sponse.SC_ INTERNAL_S ERVER_ERRO R, ex.getM essage()); | |
| 103 | } | |
| 104 | } | |
| 105 | } | |
| 106 | ||
| 107 | /* (non-Java doc) | |
| 108 | * @see gov. va.med.ima ging.wado. AbstractBa seImageSer vlet#getUs erSiteNumb er() | |
| 109 | * / | |
| 110 | @O verride | |
| 111 | pu blic Strin g getUserS iteNumber( ) | |
| 112 | { | |
| 113 | Tran sactionCon text conte xt = Trans actionCont extFactory .get(); | |
| 114 | retu rn context .getLogger SiteNumber (); | |
| 115 | } | |
| 116 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.