85. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:36 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.

85.1 Files compared

# Location File Last Modified
1 IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ClinicalDisplayWebApp\main\src\java\gov\va\med\imaging\clinicaldisplay\web AbstractBaseClinicalDisplayImageAccessServlet.java Mon Dec 4 21:35:04 2017 UTC
2 IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ClinicalDisplayWebApp\main\src\java\gov\va\med\imaging\clinicaldisplay\web AbstractBaseClinicalDisplayImageAccessServlet.java Mon Dec 4 21:58:09 2017 UTC

85.2 Comparison summary

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

85.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

85.4 Active regular expressions

No regular expressions were active.

85.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: Sep  8, 2008
  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.cli nicaldispl ay.web;
  27  
  28   import jav a.io.IOExc eption;
  29   import jav a.util.Lis t;
  30  
  31   import jav ax.managem ent.Instan ceNotFound Exception;
  32   import jav ax.servlet .http.Http ServletRes ponse;
  33  
  34   import org .apache.lo gging.log4 j.LogManag er;
  35   import org .apache.lo gging.log4 j.Logger;
  36  
  37  
  38   import gov .va.med.Gl obalArtifa ctIdentifi er;
  39   import gov .va.med.im aging.Imag eURN;
  40   import gov .va.med.im aging.core .interface s.exceptio ns.Securit yCredentia lsExpiredE xception;
  41   import gov .va.med.im aging.exch ange.enums .ImageForm at;
  42   import gov .va.med.im aging.exch ange.enums .ImageQual ity;
  43   import gov .va.med.im aging.http .AcceptEle mentList;
  44   import gov .va.med.im aging.tran sactioncon text.Trans actionCont ext;
  45   import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ;
  46   import gov .va.med.im aging.wado .AbstractB aseFacadeI mageServle t;
  47   import gov .va.med.im aging.wado .query.Wad oQuery;
  48   import gov .va.med.im aging.wado .query.Wad oRequest;
  49   import gov .va.med.im aging.wado .query.exc eptions.Wa doQueryCom plianceExc eption;
  50  
  51   /**
  52    * Abstrac t base cli nical Disp lay image  servlet th at contain s common f unctions f or retriev ing
  53    * images  in the Cli nicalDispl ay interfa ce.
  54    * 
  55    * @author         
WERFEJ
  56    *
  57    */
  58   public abs tract clas s Abstract BaseClinic alDisplayI mageAccess Servlet 
  59   extends Ab stractBase FacadeImag eServlet 
  60   {
  61           pr ivate stat ic final l ong serial VersionUID  = 1L;
  62  
  63           pr ivate stat ic Logger  logger = L ogManager. getLogger( AbstractBa seClinical DisplayIma geAccessSe rvlet.clas s);       
  64  
  65           /* *
  66            *  
  67            *  @param wa doRequest
  68            *  @param re sp
  69            *  @param lo gImageAcce ss
  70            *  @throws W adoQueryCo mplianceEx ception
  71            *  @throws I OException
  72            *  @throws I mageServle tException  
  73            *  @throws I nstanceNot FoundExcep tion
  74            * /
  75           pr otected lo ng doExcha ngeComplia ntGet(Wado Request wa doRequest,  HttpServl etResponse  resp, 
  76                    bool ean logIma geAccess) 
  77           th rows WadoQ ueryCompli anceExcept ion, IOExc eption, Im ageServlet Exception,  SecurityC redentials ExpiredExc eption
  78           {
  79                    logg er.debug(" Doing Exch ange compl iant GET:   " + wadoR equest.toS tring());
  80                    Wado Query wado Query = wa doRequest. getWadoQue ry();
  81                    
  82                    Imag eURN image Urn = wado Query.getI nstanceUrn ();
  83                    Glob alArtifact Identifier  gai = wad oQuery.get GlobalArti factIdenti fier();
  84                    Imag eQuality i mageQualit y = ImageQ uality.get ImageQuali ty( wadoRe quest.getW adoQuery() .getImageQ ualityValu e() );
  85                    Acce ptElementL ist conten tTypeList  = wadoQuer y.getConte ntTypeList ();
  86                    List <ImageForm at> conten tTypeWtihS ubTypeList  = wadoQue ry.getCont entTypeWit hSubTypeLi st();
  87                    List <ImageForm at> accept ableRespon seContent  = 
  88                             valida teContentT ype(imageQ uality, co ntentTypeL ist, conte ntTypeWtih SubTypeLis t);
  89                    
  90                    // D o sanity c heck for n on-Wado re quests
  91                    logg er.debug("    GET par ams:  imag eUrn=[" +  (imageUrn  == null ?  "NULL" : i mageUrn)
  92                                      + "]  Im ageQuality =[" + imag eQuality.n ame()
  93                                      + "]");
  94                                      
  95                    // i f the obje ct (instan ce) GUID i s supplied  then just  stream th e instance
  96                    // b ack, ignor ing any ot her parame ters
  97                    
  98                    Meta dataNotifi cation met adataNotif ication =  new Metada taNotifica tion(resp,  true);
  99                    if(w adoQuery.i sGetTxtFil e()) 
  100                    {
  101                             return  streamTxt FileInstan ceByUrn(im ageUrn, re sp.getOutp utStream() , metadata Notificati on);
  102                    }
  103                    else  
  104                    {
  105                             long b ytes = 0L;
  106                             if(ima geUrn == n ull)
  107                             {
  108                                      bytes =  streamDocu ment(gai,  resp.getOu tputStream (), metada taNotifica tion);
  109                             }
  110                             else
  111                             {
  112                                      bytes =  streamImag eInstanceB yUrn(image Urn, image Quality, a cceptableR esponseCon tent,                       
  113                                                       re sp.getOutp utStream() , metadata Notificati on, logIma geAccess);
  114                             }
  115                             return  bytes;
  116                    }
  117           }
  118  
  119           /*  (non-Java doc)
  120            *  @see gov. va.med.ima ging.wado. AbstractBa seImageSer vlet#getUs erSiteNumb er()
  121            * /
  122           @O verride
  123           pu blic Strin g getUserS iteNumber( ) 
  124           {
  125                    Tran sactionCon text conte xt = Trans actionCont extFactory .get();
  126                    retu rn context .getLogger SiteNumber ();
  127           }
  128           
  129           
  130   }

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.