Produced by Araxis Merge on 7/10/2017 1:02:03 PM 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\WAR\VixGuiWebApp-0.1\WEB-INF\tags | OverrideRouting.tagx | Sat Oct 1 19:33:48 2016 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\WAR\VixGuiWebApp-0.1\WEB-INF\tags | OverrideRouting.tagx | Thu Jul 6 17:17:20 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 144 |
| Changed | 1 | 2 |
| 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 | <?xml vers ion='1.0' encoding=' windows-12 52'?> | |
| 2 | <jsp:root | |
| 3 | ve rsion="2.0 " | |
| 4 | xm lns:jsp="h ttp://java .sun.com/J SP/Page" | |
| 5 | xm lns:tags=" urn:jsptag dir:/WEB-I NF/tags" | |
| 6 | xmlns: c="http:// java.sun.c om/jsp/jst l/core" | |
| 7 | xmlns: fn="http:/ /java.sun. com/jsp/js tl/functio ns" | |
| 8 | xmlns:busi ness="http ://imaging . URL /vix/busin ess" | |
| 9 | > | |
| 10 | <j sp:directi ve.tag imp ort="gov.v a.med.Well KnownOID"/ > | |
| 11 | ||
| 12 | <j sp:useBean id="trans actionCont ext" class ="gov.va.m ed.imaging .transacti oncontext. Transactio nContextBe an" scope= "request"/ > | |
| 13 | <j sp:useBean id="devel operRole" class="gov .va.med.im aging.exch ange.Mutab leBoolean" scope="re quest"/> | |
| 14 | ||
| 15 | <c :set var=" homeCommun ityIdParam " value="$ {param.hom eCommunity Id}" /> | |
| 16 | <j sp:useBean id="homeC ommunityId Param" typ e="java.la ng.String" /> | |
| 17 | <c :set var=" repository IdParam" v alue="${pa ram.reposi toryId}" / > | |
| 18 | <j sp:useBean id="repos itoryIdPar am" type=" java.lang. String" /> | |
| 19 | ||
| 20 | ||
| 21 | <j sp:scriptl et> | |
| 22 | deve loperRole. setValue( request.is UserInRole ("develope r") ); | |
| 23 | </ jsp:script let> | |
| 24 | ||
| 25 | <f ieldset id ="Override Routing"> | |
| 26 | <leg end> | |
| 27 | <c:c hoose> | |
| 28 | <c:whe n test='${ developerR ole.value} '>VISA Red irection</ c:when> | |
| 29 | <c:oth erwise>Rep ository</c :otherwise > | |
| 30 | </c: choose> | |
| 31 | </le gend> | |
| 32 | *Hom e Communit y ID: <c:o ut value=" ${homeComm unityIdPar am}"/> | |
| 33 | <c:c hoose> | |
| 34 | <c:whe n test='${ developerR ole.value} '> | |
| 35 | <jsp:ele ment name= "select"> | |
| 36 | <jsp:attri bute name= "id">${hom eCommunity IdParam}</ jsp:attrib ute> | |
| 37 | <jsp:attri bute name= "name">${h omeCommuni tyIdParam} </jsp:attr ibute> | |
| 38 | <jsp:attri bute name= "title">cs sbody=[dvb dy1] csshe ader=[dvhd r1] header =[Home Com munity ID] body=[The community to retrie ve data fr om.]</jsp: attribute> | |
| 39 | <jsp:body> | |
| 40 | <c :forEach v ar="oid" i tems="${We llKnownOID .values}"> | |
| 41 | <jsp :text><![C DATA[<opti on ]]></js p:text> | |
| 42 | <c:i f test="${ oid.canoni calValue e q homeComm unityIdPar am}"> | |
| 43 | <jsp:t ext><![CDA TA[ select ed="select ed"]]></js p:text> | |
| 44 | </c: if> | |
| 45 | <jsp :text><![C DATA[ valu e="]]></js p:text> | |
| 46 | ${oid. canonicalV alue} | |
| 47 | <jsp :text><![C DATA[">]]> </jsp:text > | |
| 48 | ${oid} | |
| 49 | <jsp :text><![C DATA[</opt ion>]]></j sp:text> | |
| 50 | </ c:forEach> | |
| 51 | </jsp:body > | |
| 52 | </jsp:el ement> | |
| 53 | </c:wh en> | |
| 54 | <c:oth erwise> | |
| 55 | <jsp:tex t><![CDATA [<input ty pe="text" id="commun ityId" nam e="communi tyId" size ="32" read only="read only" ]]>< /jsp:text> | |
| 56 | <jsp:tex t><![CDATA [value="]] ></jsp:tex t>${homeCo mmunityEnu m} | |
| 57 | <jsp:tex t><![CDATA ["/>]]></j sp:text> | |
| 58 | </c:ot herwise> | |
| 59 | </c: choose> | |
| 60 | ||
| 61 | <br/ > | |
| 62 | *Rep ository ID : | |
| 63 | <jsp :text><![C DATA[<inpu t type="te xt" id="re positoryId " name="re positoryId " ]]></jsp :text> | |
| 64 | <c:if test ="${not de veloperRol e.value}"> readonly= "readonly" </c:if> | |
| 65 | <jsp :text><![C DATA[value ="]]></jsp :text>${re positoryId Param}<jsp :text><![C DATA["/>]] ></jsp:tex t> | |
| 66 | <c:i f test='${ developerR ole.value} '> | |
| 67 | <p> | |
| 68 | VISA R edirection is an adv anced feat ure allowi ng develop ment and o perations personnel to direct requests t o a specif ic | |
| 69 | artifa ct reposit ory. This is NOT in tended for use by cl inical sta ff, it may produce i ntuitively incorrect results. | |
| 70 | </p> | |
| 71 | </c: if> | |
| 72 | </ fieldset> | |
| 73 | </jsp:root > |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.