67. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 3/25/2019 8:58:04 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.

67.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\ViewerImagingDataSourceProvider\main\src\java\gov\va\med\imaging\viewer\datasource ViewerImagingQueryFactory.java Mon Mar 18 20:39:10 2019 UTC
2 C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\ViewerImagingDataSourceProvider\main\src\java\gov\va\med\imaging\viewer\datasource ViewerImagingQueryFactory.java Tue Mar 19 12:04:08 2019 UTC

67.2 Comparison summary

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

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

67.4 Active regular expressions

No regular expressions were active.

67.5 Comparison detail

  1   /**
  2    * 
  3    * Date Cr eated: Apr  26, 2017
  4    * Develop er:  DNS     tjahjb
  5    */
  6   package go v.va.med.i maging.vie wer.dataso urce;
  7  
  8   import jav a.text.Dec imalFormat ;
  9   import jav a.util.Arr ayList;
  10   import jav a.util.Has hMap;
  11   import jav a.util.Lis t;
  12  
  13   import gov .va.med.SE RIALIZATIO N_FORMAT;
  14   import gov .va.med.UR NFactory;
  15   import gov .va.med.im aging.Abst ractImagin gURN;
  16   import gov .va.med.im aging.core .interface s.exceptio ns.ImageNo tFoundExce ption;
  17   import gov .va.med.im aging.exce ptions.URN FormatExce ption;
  18   import gov .va.med.im aging.url. vista.Stri ngUtils;
  19   import gov .va.med.im aging.url. vista.Vist aQuery;
  20   import gov .va.med.im aging.view er.busines s.DeleteIm ageUrn;
  21   import gov .va.med.im aging.view er.busines s.FlagSens itiveImage Urn;
  22   import gov .va.med.im aging.view er.busines s.LogAcces sImageUrn;
  23  
  24   /**
  25    * @author   DNS     tjahjb
  26    *
  27    */
  28   public cla ss ViewerI magingQuer yFactory
  29   {
  30           pr ivate fina l static S tring RPC_ GET_VARIAB LE_VALUE =  "XWB GET  VARIABLE V ALUE";
  31           pr ivate fina l static S tring RPC_ SET_IMAGES _PROPS = " MAGN SET I MAGES PROP S BY IEN";
  32           pr ivate fina l static S tring RPC_ DELETE_IMA GES = "MAG N DELETE I MAGES BY I EN";
  33           pr ivate fina l static S tring RPC_ LOG_IMAGE_ ACCESSS =  "MAGN LOG  IMAGE ACCE SS BY IEN" ;
  34  
  35  
  36           pu blic stati c VistaQue ry createD eleteImage sQuery(Lis t<DeleteIm ageUrn> im ageUrns)
  37           {
  38                    Vist aQuery que ry = new V istaQuery( RPC_DELETE _IMAGES);
  39                    
  40                    Hash Map<String , String>  parameters  = new Has hMap<Strin g, String> ();
  41                    
  42                    for( int i = 0;  i < image Urns.size( ); i++)
  43                    {
  44                             parame ters.put(" \"" + i +  "\"", 
  45                                               ViewerImag ingTransla tor.getIma geIen(imag eUrns.get( i).getValu e()) + "^"  + 
  46                                               (imageUrns .get(i).is DeleteGrou p() ? "1"  : "0") + " ^" +
  47                                               imageUrns. get(i).get Reason());
  48                    }
  49  
  50                    quer y.addParam eter(Vista Query.LIST , paramete rs);
  51                    
  52                    retu rn query;
  53           }
  54           
  55           pu blic stati c VistaQue ry createF lagSensiti veImagesQu ery(List<F lagSensiti veImageUrn > imageUrn s)
  56           {
  57                    Vist aQuery que ry = new V istaQuery( RPC_SET_IM AGES_PROPS );
  58                    
  59                    Hash Map<String , String>  parameters  = new Has hMap<Strin g, String> ();
  60                    
  61                    for( int i = 0;  i < image Urns.size( ); i++)
  62                    {
  63                             parame ters.put(" \"" + i +  "\"", 
  64                                               ViewerImag ingTransla tor.getIma geIen(imag eUrns.get( i).getImag eUrn()) + 
  65                                               "^SENSIMG^ " + 
  66                                               (imageUrns .get(i).is Sensitive( ) ? "1" :  "0"));
  67                    }
  68  
  69                    quer y.addParam eter(Vista Query.LIST , paramete rs);
  70                    
  71                    retu rn query;
  72           }
  73           
  74           pu blic stati c VistaQue ry createG etUserInfo rmationByU serIdQuery (String us erId)
  75           {                 
  76                    Vist aQuery msg  = new Vis taQuery(RP C_GET_VARI ABLE_VALUE );
  77                    Stri ng arg = " ^VA(200,"  + userId +  ",0)";
  78                    msg. addParamet er(VistaQu ery.REFERE NCE, arg);
  79                    retu rn msg;
  80           }
  81  
  82           pu blic stati c VistaQue ry createL ogAccessIm agesQuery(
  83                    Stri ng patient Dfn,
  84                    List <LogAccess ImageUrn>  imageUrns)
  85           {
  86                    Vist aQuery que ry = new V istaQuery( RPC_LOG_IM AGE_ACCESS S);
  87                    
  88                    Hash Map<String , String>  parameters  = new Has hMap<Strin g, String> ();
  89                    
  90                    for( int i = 0;  i < image Urns.size( ); i++)
  91                    {
  92                             LogAcc essImageUr n logUrn =  imageUrns .get(i);
  93                             String  imageIen  = ViewerIm agingTrans lator.getI mageIen(im ageUrns.ge t(i).getIm ageUrn());
  94                                      
  95                             parame ters.put(" \"" + i +  "\"", 
  96                                                       im ageIen + " ^" +
  97                                                       "A ^^" +
  98                                                       im ageIen + " ^" +
  99                                                       lo gUrn.getAc cessReason () + "^" +
  100                                                       pa tientDfn +  "^1"
  101                                                       );
  102                    }
  103  
  104                    quer y.addParam eter(Vista Query.LIST , paramete rs);
  105                    
  106                    retu rn query;
  107           }
  108           
  109  
  110   }