58. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/5/2018 10:24:16 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.

58.1 Files compared

# Location File Last Modified
1 patch_205_build_9.zip\Java\XCAInitiatingGatewayDataSourceProvider\main\src\java\gov\va\med\imaging\ihe\xca\datasource XCADocumentSetDataSourceService.java Wed May 30 14:35:28 2018 UTC
2 patch_205_build_9.zip\Java\XCAInitiatingGatewayDataSourceProvider\main\src\java\gov\va\med\imaging\ihe\xca\datasource XCADocumentSetDataSourceService.java Mon Jun 4 20:54:45 2018 UTC

58.2 Comparison summary

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

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

58.4 Active regular expressions

No regular expressions were active.

58.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: Jun  23, 2009
  6     Site Nam e:  Washin gton OI Fi eld Office , Silver S pring, MD
  7       Developer:     PII
  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.ihe .xca.datas ource;
  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.data source.Abs tractVersi onableData Source;
  33   import gov .va.med.im aging.data source.Doc umentSetDa taSourceSp i;
  34   import gov .va.med.im aging.exch ange.busin ess.Docume ntFilter;
  35   import gov .va.med.im aging.exch ange.busin ess.docume nts.Docume ntSetResul t;
  36   import gov .va.med.im aging.ihe. xca.dataso urce.confi guration.X CADataSour ceConfigur ation;
  37   import gov .va.med.im aging.ihe. xca.dataso urce.confi guration.X CASiteConf iguration;
  38   import gov .va.med.im aging.ihe. xca.proxy. XCADataSou rceProxy;
  39   import gov .va.med.im aging.tran sactioncon text.Trans actionCont ext;
  40   import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ;
  41   import jav a.net.Malf ormedURLEx ception;
  42   import org .apache.lo gging.log4 j.LogManag er;
  43   import org .apache.lo gging.log4 j.Logger;
  44  
  45   /**
  46    * @author   PII
  47    *
  48    */
  49   public cla ss XCADocu mentSetDat aSourceSer vice
  50   extends Ab stractVers ionableDat aSource
  51   implements  DocumentS etDataSour ceSpi 
  52   {
  53           pr ivate fina l static L ogger logg er = LogMa nager.getL ogger(XCAD ocumentDat aSourceSer vice.class );
  54           pu blic final  static St ring SUPPO RTED_PROTO COL = "xca ";
  55  
  56           /* *
  57            *  @param re solvedArti factSource
  58            *  @param pr otocol
  59            * /
  60           pu blic XCADo cumentSetD ataSourceS ervice(Res olvedArtif actSource  resolvedAr tifactSour ce, String  protocol)
  61           {
  62                    supe r(resolved ArtifactSo urce, prot ocol);
  63           }
  64  
  65           @O verride
  66           pr otected XC ADataSourc eConfigura tion getCo nfiguratio n()
  67           {
  68                    retu rn (XCADat aSourceCon figuration )super.get Configurat ion();
  69           }
  70           
  71           /*  (non-Java doc)
  72            *  @see gov. va.med.ima ging.datas ource.Docu mentSetDat aSource#ge tPatientDo cumentSets (java.lang .String, g ov.va.med. imaging.ex change.bus iness.Docu mentFilter )
  73            * /
  74           @O verride
  75           pu blic Docum entSetResu lt getPati entDocumen tSets(Rout ingToken g lobalRouti ngToken, D ocumentFil ter filter
  76           th rows Metho dException , Connecti onExceptio
  77           {
  78                    Tran sactionCon text trans actionCont ext = Tran sactionCon textFactor y.get();
  79                    tran sactionCon text.setDa taSourceVe rsion("1") ;
  80                    tran sactionCon text.setDa taSourceMe thod("getD ocumentSet s");
  81                    logg er.info("g etPatientD ocumentSet s('" + fil ter.getPat ientId() +  "') made  by " + tra nsactionCo ntext.getD isplayIden tity());
  82  
  83                    Reso lvedArtifa ctSource f ixedUpReso lvedArtifa ctSource =  null;
  84                    if(g etConfigur ation() !=  null)
  85                    {
  86                             XCASit eConfigura tion siteC onfigurati on = getCo nfiguratio n().findSi teConfigur ation(getR esolvedArt ifactSourc e());
  87                             try
  88                             {
  89                                      fixedUpR esolvedArt ifactSourc e = getCon figuration ().fixupUR LPaths( ge tResolvedA rtifactSou rce(), sit eConfigura tion );
  90                             }
  91                             catch  (Malformed URLExcepti on x)
  92                             {
  93                                      String m essage = 
  94                                               "Unable to  fix up UR L paths fo r resolved  artifact  source '"  + getResol vedArtifac tSource(). toString()  + 
  95                                               "' using c onfigurati on '" + si teConfigur ation.toSt ring() + " '.";
  96                                      logger.e rror(messa ge, x);
  97                                      throw ne w MethodEx ception(me ssage, x);
  98                             }
  99                    }
  100                    else
  101                    {
  102                             fixedU pResolvedA rtifactSou rce = getR esolvedArt ifactSourc e();
  103                             logger .warn("No  XCA Data S ource Conf iguration  is set, no  fix-up of  applicati on path or  file is b eing appli ed.");
  104                    }
  105                    XCAD ataSourceP roxy proxy  = new XCA DataSource Proxy(fixe dUpResolve dArtifactS ource, get Configurat ion());
  106                    
  107                    Docu mentSetRes ult result  = proxy.g etPatientD ocumentSet s(filter);
  108                    logg er.info("D one with g etPatientD ocumentSet s(), retur ning " + ( result ==  null ? "0"  : result. getArtifac tSize()) +  " documen t sets");
  109                    retu rn result;
  110           }
  111  
  112           /*  (non-Java doc)
  113            *  @see gov. va.med.ima ging.datas ource.Docu mentSetDat aSource#is VersionCom patible()
  114            * /
  115           @O verride
  116           pu blic boole an isVersi onCompatib le() 
  117           {
  118                    retu rn true;
  119           }        
  120   }