32. Araxis Merge File Comparison Report

Produced by Araxis Merge on Sat May 2 08:30:17 2009 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

32.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\allums\Desktop\2008.4\Formats\WebWorks Help 5.0\Transforms wwhelp_entry.xsl Mon Jan 19 18:02:50 2009 UTC
2 C:\Documents and Settings\allums\Desktop\2009.1\Formats\WebWorks Help 5.0\Transforms wwhelp_entry.xsl Sat May 2 06:55:52 2009 UTC

32.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 11 248
Changed 6 20
Inserted 4 15
Removed 0 0

32.3 Comparison options

Whitespace Differences in whitespace are significant
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

32.4 Active regular expressions

Expression Description
\$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments

32.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" UTF-8"?>   1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Help-Setti ngs-Schema "   2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Help-Setti ngs-Schema "
3                                    xmlns:wwhs ettings="u rn:WebWork s-Help-Set tings-Sche ma"   3                                    xmlns:wwhs ettings="u rn:WebWork s-Help-Set tings-Sche ma"
4                                    xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"   4                                    xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
5                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"   5                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
6                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"   6                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"
7                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"   7                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"
8                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"   8                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
9                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"   9                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
10                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"   10                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
11                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"   11                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
12                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"   12                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
13                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"   13                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"
14                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"   14                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"
15                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"   15                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
16                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"   16                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
17                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"   17                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
18                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"   18                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
19                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"   19                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
20                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"   20                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
21                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"   21                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
22                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"   22                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
23                                    exclude-re sult-prefi xes="xsl m sxsl wwtoc  wwlinks w wmode wwfi les wwdoc  wwsplits w wproject w wpage wwlo cale wwpro gress wwlo g wwfilesy stem wwuri  wwstring  wwfilesext  wwprojext  wwexsldoc "   23                                    exclude-re sult-prefi xes="xsl m sxsl wwtoc  wwlinks w wmode wwfi les wwdoc  wwsplits w wproject w wpage wwlo cale wwpro gress wwlo g wwfilesy stem wwuri  wwstring  wwfilesext  wwprojext  wwexsldoc "
24   >   24   >
25    <xsl:para m name="Gl obalInput"  />   25    <xsl:para m name="Gl obalInput"  />
26    <xsl:para m name="Gl obalPipeli neName" />   26    <xsl:para m name="Gl obalPipeli neName" />
27    <xsl:para m name="Gl obalProjec t" />   27    <xsl:para m name="Gl obalProjec t" />
28    <xsl:para m name="Gl obalFiles"  />   28    <xsl:para m name="Gl obalFiles"  />
29    <xsl:para m name="Pa rameterSpl itsType" / >   29    <xsl:para m name="Pa rameterSpl itsType" / >
30    <xsl:para m name="Pa rameterTyp e" />   30    <xsl:para m name="Pa rameterTyp e" />
31    <xsl:para m name="Pa rameterWWH elpEntrySp litFileTyp e" />   31    <xsl:para m name="Pa rameterWWH elpEntrySp litFileTyp e" />
32    <xsl:para m name="Pa rameterCat egory" />   32    <xsl:para m name="Pa rameterCat egory" />
33    <xsl:para m name="Pa rameterUse " />   33    <xsl:para m name="Pa rameterUse " />
34    <xsl:para m name="Pa rameterDep loy" />   34    <xsl:para m name="Pa rameterDep loy" />
35    <xsl:para m name="Pa rameterMer geCategory " />   35    <xsl:para m name="Pa rameterMer geCategory " />
36    <xsl:para m name="Pa rameterMer geUse" />   36    <xsl:para m name="Pa rameterMer geUse" />
37    <xsl:para m name="Pa rameterMer geDeploy"  />   37    <xsl:para m name="Pa rameterMer geDeploy"  />
38     38  
39     39  
40    <xsl:outp ut encodin g="UTF-8"  indent="ye s" />   40    <xsl:outp ut encodin g="UTF-8"  indent="ye s" />
41    <xsl:name space-alia s styleshe et-prefix= "wwhsettin gs" result -prefix="# default" / >   41    <xsl:name space-alia s styleshe et-prefix= "wwhsettin gs" result -prefix="# default" / >
42    <xsl:stri p-space el ements="*"  />   42    <xsl:stri p-space el ements="*"  />
43     43  
44     44  
45    <xsl:key  name="wwfi les-files- by-groupid -type" mat ch="wwfile s:File" us e="concat( @groupID,  ':', @type )" />   45    <xsl:key  name="wwfi les-files- by-groupid -type" mat ch="wwfile s:File" us e="concat( @groupID,  ':', @type )" />
46    <xsl:key  name="wwsp lits-files -by-groupi d-type" ma tch="wwspl its:File"  use="conca t(@groupID , ':', @ty pe)" />   46    <xsl:key  name="wwsp lits-files -by-groupi d-type" ma tch="wwspl its:File"  use="conca t(@groupID , ':', @ty pe)" />
47     47  
48     48  
49    <xsl:vari able name= "GlobalAct ionChecksu m">   49    <xsl:vari able name= "GlobalAct ionChecksu m">
50     <xsl:var iable name ="VarTrans formChecks ums">   50     <xsl:var iable name ="VarTrans formChecks ums">
51      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />   51      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
52     </xsl:va riable>   52     </xsl:va riable>
53     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />   53     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
54    </xsl:var iable>   54    </xsl:var iable>
55     55  
56     56  
57    <xsl:vari able name= "GlobalEnt ryTemplate Path" sele ct="wwuri: AsFilePath ('wwformat :Transform s/wwhelp_e ntry.html' )" />   57    <xsl:vari able name= "GlobalEnt ryTemplate Path" sele ct="wwuri: AsFilePath ('wwformat :Transform s/wwhelp_e ntry.html' )" />
58     58  
59     59  
60    <xsl:temp late match ="/">   60    <xsl:temp late match ="/">
61     <wwfiles :Files ver sion="1.0" >   61     <wwfiles :Files ver sion="1.0" >
62     62  
63      <!-- Gr oups -->   63      <!-- Gr oups -->
64      <!--         -->   64      <!--         -->
65      <xsl:va riable nam e="VarProj ectGroups"  select="$ GlobalProj ect/wwproj ect:Projec t/wwprojec t:Groups/w wproject:G roup" />   65      <xsl:va riable nam e="VarProj ectGroups"  select="$ GlobalProj ect/wwproj ect:Projec t/wwprojec t:Groups/w wproject:G roup" />
66      <xsl:va riable nam e="Var Ign o
re 1 Start" sel ect="wwpro gress:Star t(count($V arProjectG roups) + 1 )" />
  66      <xsl:va riable nam e="Var Pr o g re ssProjectG roups Start" sel ect="wwpro gress:Star t(count($V arProjectG roups) + 1 )" />
67     67  
68      <xsl:fo r-each sel ect="$VarP rojectGrou ps">   68      <xsl:fo r-each sel ect="$VarP rojectGrou ps">
69       <xsl:v ariable na me="VarPro jectGroup"  select=". " />   69       <xsl:v ariable na me="VarPro jectGroup"  select=". " />
70     70  
71       <xsl:v ariable na me="Var Ign o
re 2 Start" sel ect="wwpro gress:Star t(1)" />
  71       <xsl:v ariable na me="Var Pr o g re ssProjectG roup Start" sel ect="wwpro gress:Star t(1)" />
72     72  
73       <!-- L oad splits  -->   73       <!-- L oad splits  -->
74       <!--               -->   74       <!--               -->
75       <xsl:f or-each se lect="$Glo balFiles[1 ]">   75       <xsl:f or-each se lect="$Glo balFiles[1 ]">
76        <xsl: variable n ame="VarFi lesSplits"  select="k ey('wwfile s-files-by -groupid-t ype', conc at($VarPro jectGroup/ @GroupID,  ':', $Para meterSplit sType))[1] " />   76        <xsl: variable n ame="VarFi lesSplits"  select="k ey('wwfile s-files-by -groupid-t ype', conc at($VarPro jectGroup/ @GroupID,  ':', $Para meterSplit sType))[1] " />
77        <xsl: variable n ame="VarSp lits" sele ct="wwexsl doc:LoadXM LWithoutRe solver($Va rFilesSpli ts/@path)"  />   77        <xsl: variable n ame="VarSp lits" sele ct="wwexsl doc:LoadXM LWithoutRe solver($Va rFilesSpli ts/@path)"  />
78     78  
79        <!--  Get entry  path -->   79        <!--  Get entry  path -->
80        <!--                  -->   80        <!--                  -->
81        <xsl: for-each s elect="$Va rSplits[1] ">   81        <xsl: for-each s elect="$Va rSplits[1] ">
82         <xsl :variable  name="VarE ntryFile"  select="ke y('wwsplit s-files-by -groupid-t ype', conc at($VarPro jectGroup/ @GroupID,  ':', $Para meterWWHel pEntrySpli tFileType) )[1]" />   82         <xsl :variable  name="VarE ntryFile"  select="ke y('wwsplit s-files-by -groupid-t ype', conc at($VarPro jectGroup/ @GroupID,  ':', $Para meterWWHel pEntrySpli tFileType) )[1]" />
83     83  
        84         <!--  Determine  secure en try file p ath -->
        85         <!--                                      -->
        86         <xsl :variable  name="VarG roupOutput DirectoryP ath" selec t="wwfiles ystem:Comb ine(wwproj ext:GetTar getOutputD irectoryPa th(), $Var ProjectGro up/@Name)"  />
        87         <xsl :variable  name="VarS ecureEntry FilePath"  select="ww filesystem :Combine($ VarGroupOu tputDirect oryPath, ' wwhsec.htm ')" />
        88  
84         <!--  Set entry  -->   89         <!--  Set entry  -->
85         <!--             -->   90         <!--             -->
86         <xsl :variable  name="VarU pToDate" s elect="wwf ilesext:Up ToDate($Va rEntryFile /@path, $V arProjectG roup/@Chan geID, $Var ProjectGro up/@GroupI D, '', $Gl obalAction Checksum)"  />   91         <xsl :variable  name="VarU pToDate" s elect="wwf ilesext:Up ToDate($Va rEntryFile /@path, $V arProjectG roup/@Chan geID, $Var ProjectGro up/@GroupI D, '', $Gl obalAction Checksum)"  />
87         <xsl :if test=" not($VarUp ToDate)">   92         <xsl :if test=" not($VarUp ToDate)">
88          <!- - Copy -->   93          <!- - Copy -->
89          <!- -      -->   94          <!- -      -->
90          <xs l:variable  name="Var Ign o
r
e 3 " select=" wwfilesyst em:CopyFil e($GlobalE ntryTempla tePath, $V arEntryFil e/@path)"  />
  95          <xs l:variable  name="Var C o pyEnt r yFil e
" select=" wwfilesyst em:CopyFil e($GlobalE ntryTempla tePath, $V arEntryFil e/@path)"  />
        96  
        97          <!- - Copy for  FireFox 3 .0 securit y issue -- >
        98          <!- -                                        -- >
        99          <xs l:variable  name="Var CopySecure EntryFile"  select="w wfilesyste m:CopyFile ($GlobalEn tryTemplat ePath, $Va rSecureEnt ryFilePath )" />
91         </xs l:if>   100         </xs l:if>
92     101  
93         <!--  Report Fi les -->   102         <!--  Report Fi les -->
94         <!--                -->   103         <!--                -->
95         <wwf iles:File  path="{$Va rEntryFile /@path}" t ype="{$Par ameterType }" checksu m="{wwfile system:Get Checksum($ VarEntryFi le/@path)} " projectc hecksum="{ $VarProjec tGroup/@Ch angeID}" g roupID="{$ VarProject Group/@Gro upID}" doc umentID=""  actionche cksum="{$G lobalActio nChecksum} " category ="{$Parame terCategor y}" use="{ $Parameter Use}" depl oy="{$Para meterDeplo y}">   104         <wwf iles:File  path="{$Va rEntryFile /@path}" t ype="{$Par ameterType }" checksu m="{wwfile system:Get Checksum($ VarEntryFi le/@path)} " projectc hecksum="{ $VarProjec tGroup/@Ch angeID}" g roupID="{$ VarProject Group/@Gro upID}" doc umentID=""  actionche cksum="{$G lobalActio nChecksum} " category ="{$Parame terCategor y}" use="{ $Parameter Use}" depl oy="{$Para meterDeplo y}">
96          <ww files:Depe nds path=" {$GlobalEn tryTemplat ePath}" ch ecksum="{w wfilesyste m:GetCheck sum($Globa lEntryTemp latePath)} " groupID= "" documen tID="" />   105          <ww files:Depe nds path=" {$GlobalEn tryTemplat ePath}" ch ecksum="{w wfilesyste m:GetCheck sum($Globa lEntryTemp latePath)} " groupID= "" documen tID="" />
97         </ww files:File >   106         </ww files:File >
        107         <wwf iles:File  path="{$Va rSecureEnt ryFilePath }" type="{ $Parameter Type}" che cksum="{ww filesystem :GetChecks um($VarSec ureEntryFi lePath)}"  projectche cksum="{$V arProjectG roup/@Chan geID}" gro upID="{$Va rProjectGr oup/@Group ID}" docum entID="" a ctioncheck sum="{$Glo balActionC hecksum}"  category=" {$Paramete rCategory} " use="{$P arameterUs e}" deploy ="{$Parame terDeploy} ">
        108          <ww files:Depe nds path=" {$GlobalEn tryTemplat ePath}" ch ecksum="{w wfilesyste m:GetCheck sum($Globa lEntryTemp latePath)} " groupID= "" documen tID="" />
        109         </ww files:File >
98     110  
99        </xsl :for-each>   111        </xsl :for-each>
100       </xsl: for-each>   112       </xsl: for-each>
101     113  
102       <xsl:v ariable na me="Var Ign o
re 2 End" selec t="wwprogr ess:End()"  />
  114       <xsl:v ariable na me="Var Pr o g re ssProjectG roup End" selec t="wwprogr ess:End()"  />
103      </xsl:f or-each>   115      </xsl:f or-each>
104     116  
105      <!-- Me rge -->   117      <!-- Me rge -->
106      <!--        -->   118      <!--        -->
107      <xsl:if  test="cou nt($VarPro jectGroups ) &gt; 1">   119      <xsl:if  test="cou nt($VarPro jectGroups ) &gt; 1">
108       <xsl:v ariable na me="VarEnt ryPath" se lect="wwfi lesystem:C ombine(wwp rojext:Get TargetOutp utDirector yPath(), w wprojext:G etFormatSe tting('wwh elp-entry' , 'index.h tml'))" />   120       <xsl:v ariable na me="VarEnt ryPath" se lect="wwfi lesystem:C ombine(wwp rojext:Get TargetOutp utDirector yPath(), w wprojext:G etFormatSe tting('wwh elp-entry' , 'index.h tml'))" />
109     121  
        122       <!-- D etermine s ecure entr y file pat h -->
        123       <!--                                      -->
        124       <xsl:v ariable na me="VarSec ureEntryFi lePath" se lect="wwfi lesystem:C ombine(wwp rojext:Get TargetOutp utDirector yPath(), ' wwhsec.htm ')" />
        125  
110       <!-- S et entry - ->   126       <!-- S et entry - ->
111       <!--            - ->   127       <!--            - ->
112       <xsl:v ariable na me="VarUpT oDate" sel ect="wwfil esext:UpTo Date($VarE ntryPath,  $GlobalPro ject/wwpro ject:Proje ct/@Change ID, '', '' , $GlobalA ctionCheck sum)" />   128       <xsl:v ariable na me="VarUpT oDate" sel ect="wwfil esext:UpTo Date($VarE ntryPath,  $GlobalPro ject/wwpro ject:Proje ct/@Change ID, '', '' , $GlobalA ctionCheck sum)" />
113       <xsl:i f test="no t($VarUpTo Date)">   129       <xsl:i f test="no t($VarUpTo Date)">
114        <!--  Copy -->   130        <!--  Copy -->
115        <!--       -->   131        <!--       -->
116        <xsl: variable n ame="Var Ign o
r
e 4 " select=" wwfilesyst em:CopyFil e($GlobalE ntryTempla tePath, $V arEntryPat h)" />
  132        <xsl: variable n ame="Var C o pyEnt r yFil e
" select=" wwfilesyst em:CopyFil e($GlobalE ntryTempla tePath, $V arEntryPat h)" />
        133  
        134        <!--  Copy for F ireFox 3.0  security  issue -->
        135        <!--                                         -->
        136        <xsl: variable n ame="VarCo pySecureEn tryFile" s elect="wwf ilesystem: CopyFile($ GlobalEntr yTemplateP ath, $VarS ecureEntry FilePath)"  />
117       </xsl: if>   137       </xsl: if>
118     138  
119       <!-- R eport File s -->   139       <!-- R eport File s -->
120       <!--                -->   140       <!--                -->
121       <wwfil es:File pa th="{$VarE ntryPath}"  type="{$P arameterTy pe}" check sum="{wwfi lesystem:G etChecksum ($VarEntry Path)}" pr ojectcheck sum="{$Glo balProject /wwproject :Project/@ ChangeID}"  groupID=" " document ID="" acti onchecksum ="{$Global ActionChec ksum}" cat egory="{$P arameterMe rgeCategor y}" use="{ $Parameter MergeUse}"  deploy="{ $Parameter MergeDeplo y}">   141       <wwfil es:File pa th="{$VarE ntryPath}"  type="{$P arameterTy pe}" check sum="{wwfi lesystem:G etChecksum ($VarEntry Path)}" pr ojectcheck sum="{$Glo balProject /wwproject :Project/@ ChangeID}"  groupID=" " document ID="" acti onchecksum ="{$Global ActionChec ksum}" cat egory="{$P arameterMe rgeCategor y}" use="{ $Parameter MergeUse}"  deploy="{ $Parameter MergeDeplo y}">
122        <wwfi les:Depend s path="{$ GlobalEntr yTemplateP ath}" chec ksum="{wwf ilesystem: GetChecksu m($GlobalE ntryTempla tePath)}"  groupID=""  documentI D="" />   142        <wwfi les:Depend s path="{$ GlobalEntr yTemplateP ath}" chec ksum="{wwf ilesystem: GetChecksu m($GlobalE ntryTempla tePath)}"  groupID=""  documentI D="" />
123       </wwfi les:File>   143       </wwfi les:File>
        144       <wwfil es:File pa th="{$VarS ecureEntry FilePath}"  type="{$P arameterTy pe}" check sum="{wwfi lesystem:G etChecksum ($VarSecur eEntryFile Path)}" pr ojectcheck sum="{$Glo balProject /wwproject :Project/@ ChangeID}"  groupID=" " document ID="" acti onchecksum ="{$Global ActionChec ksum}" cat egory="{$P arameterMe rgeCategor y}" use="{ $Parameter MergeUse}"  deploy="{ $Parameter MergeDeplo y}">
        145        <wwfi les:Depend s path="{$ GlobalEntr yTemplateP ath}" chec ksum="{wwf ilesystem: GetChecksu m($GlobalE ntryTempla tePath)}"  groupID=""  documentI D="" />
        146       </wwfi les:File>
124      </xsl:i f>   147      </xsl:i f>
125     148  
126      <xsl:va riable nam e="Var Ign o
re 1 End" selec t="wwprogr ess:End()"  />
  149      <xsl:va riable nam e="Var Pr o g re ssProjectG roups End" selec t="wwprogr ess:End()"  />
127     150  
128     </wwfile s:Files>   151     </wwfile s:Files>
129    </xsl:tem plate>   152    </xsl:tem plate>
130   </xsl:styl esheet>   153   </xsl:styl esheet>