43. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Nov 21 17:21:46 2008 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.

43.1 Files compared

# Location File Last Modified
1 Fri Nov 21 17:21:46 2008 UTC
2 C:\Documents and Settings\allums\Desktop\2008.2.20597.p2\Formats\Shared\common\topics document.xsl Tue Jun 10 22:53:50 2008 UTC

43.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 1 150
Removed 0 0

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

43.4 Active regular expressions

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

43.5 Comparison detail

        1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
        2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Topics-Sch ema"
        3                                    xmlns:wwto pics="urn: WebWorks-T opics-Sche ma"
        4                                    xmlns:wwbe haviors="u rn:WebWork s-Behavior s-Schema"
        5                                    xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
        6                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
        7                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
        8                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"
        9                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
        10                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        11                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        12                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"
        13                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        14                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        15                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        16                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        17                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        18                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
        19                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        20                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        21                                    exclude-re sult-prefi xes="xsl m sxsl wwmod e wwbehavi ors wwlink s wwfiles  wwproject  wwlocale w wprogress  wwlog wwfi lesystem w wuri wwstr ing wwfile sext wwpro jext wwexs ldoc"
        22   >
        23    <xsl:para m name="Gl obalInput"  />
        24    <xsl:para m name="Gl obalPipeli neName" />
        25    <xsl:para m name="Gl obalProjec t" />
        26    <xsl:para m name="Gl obalFiles"  />
        27    <xsl:para m name="Pa rameterDep endsType"  />
        28    <xsl:para m name="Pa rameterBeh aviorsType " />
        29    <xsl:para m name="Pa rameterTyp e" />
        30  
        31  
        32    <xsl:name space-alia s styleshe et-prefix= "wwtopics"  result-pr efix="#def ault" />
        33  
        34  
        35    <xsl:key  name="wwfi les-files- by-type" m atch="wwfi les:File"  use="@type " />
        36    <xsl:key  name="wwbe haviors-ma rkers-by-b ehavior" m atch="wwbe haviors:Ma rker" use= "@behavior " />
        37    <xsl:key  name="wwdo c-paragrap hs-by-id"  match="wwd oc:Paragra ph" use="@ id" />
        38  
        39  
        40    <xsl:vari able name= "GlobalAct ionChecksu m">
        41     <xsl:var iable name ="VarTrans formChecks ums">
        42      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
        43     </xsl:va riable>
        44     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
        45    </xsl:var iable>
        46  
        47  
        48    <xsl:temp late match ="/">
        49     <wwfiles :Files ver sion="1.0" >
        50  
        51      <!-- It erate inpu t document s -->
        52      <!--                            -->
        53      <xsl:fo r-each sel ect="$Glob alInput[1] ">
        54       <xsl:v ariable na me="VarWif Files" sel ect="key(' wwfiles-fi les-by-typ e', $Param eterDepend sType)" />
        55  
        56       <xsl:v ariable na me="VarPro gressStart Behaviors"  select="w wprogress: Start(coun t($VarWifF iles))" />
        57  
        58       <xsl:f or-each se lect="$Var WifFiles">
        59        <xsl: variable n ame="VarWi fFile" sel ect="." />
        60        
        61        <xsl: variable n ame="VarWi f" select= "wwexsldoc :LoadXMLWi thoutResol ver($VarWi fFile/@pat h)" />
        62  
        63        <xsl: variable n ame="VarPr ogressStar tBehavior"  select="w wprogress: Start(1)"  />
        64        
        65        <xsl: for-each s elect="$Gl obalFiles[ 1]">
        66         <xsl :variable  name="VarB ehaviorsFi le" select ="key('wwf iles-files -by-type',  $Paramete rBehaviors Type)[@doc umentID =  $VarWifFil e/@documen tID][1]" / >
        67         
        68         <xsl :variable  name="VarB ehaviors"  select="ww exsldoc:Lo adXMLWitho utResolver ($VarBehav iorsFile/@ path)" />
        69  
        70         <!--  Aborted?  -->
        71         <!--            -->
        72         <xsl :if test=" not(wwprog ress:Abort ())">
        73          <!- - Up to da te? -->
        74          <!- -              -->
        75          <xs l:variable  name="Var Path" sele ct="wwfile system:Com bine(wwfil esystem:Ge tDirectory Name($VarW ifFile/@pa th), conca t(translat e($Paramet erType, ': ', '_'), ' .xml'))" / >
        76          <xs l:variable  name="Var UpToDate"  select="ww filesext:U pToDate($V arPath, $G lobalProje ct/wwproje ct:Project /@ChangeID , $VarWifF ile/@group ID, $VarWi fFile/@doc umentID, $ GlobalActi onChecksum )" />
        77          <xs l:if test= "not($VarU pToDate)">
        78           <x sl:variabl e name="Va rResultAsX ML">
        79  
        80            < wwtopics:T opics docu mentID="{$ VarWifFile /@document ID}">
        81              <xsl:apply -templates  select="$ VarBehavio rs/wwbehav iors:Behav iors/desce ndant::wwb ehaviors:P aragraph">
        82               <xsl:with -param nam e="ParamWi f" select= "$VarWif"  />
        83               <xsl:with -param nam e="ParamDo cumentID"  select="$V arWifFile/ @documentI D" />
        84              </xsl:appl y-template s>
        85            < /wwtopics: Topics>
        86           </ xsl:variab le>
        87           <x sl:variabl e name="Va rResult" s elect="msx sl:node-se t($VarResu ltAsXML)"  />
        88           <x sl:variabl e name="Va rWriteResu lt" select ="wwexsldo c:Document ($VarResul t, $VarPat h, 'utf-8' , 'xml', ' 1.0', 'yes ')" />
        89          </x sl:if>
        90  
        91          <ww files:File  path="{$V arPath}" t ype="{$Par ameterType }" checksu m="{wwfile system:Get Checksum($ VarPath)}"  projectch ecksum="{$ GlobalProj ect/wwproj ect:Projec t/@ChangeI D}" groupI D="{$VarWi fFile/@gro upID}" doc umentID="{ $VarWifFil e/@documen tID}" acti onchecksum ="{$Global ActionChec ksum}">
        92           <w wfiles:Dep ends path= "{$VarWifF ile/@path} " checksum ="{$VarWif File/@chec ksum}" gro upID="{$Va rWifFile/@ groupID}"  documentID ="{$VarWif File/@docu mentID}" / >
        93          </w wfiles:Fil e>
        94         </xs l:if>
        95        
        96        </xsl :for-each>
        97  
        98        <xsl: variable n ame="VarPr ogressEndB ehavior" s elect="wwp rogress:En d()" />
        99       </xsl: for-each>
        100  
        101       <xsl:v ariable na me="VarPro gressEndBe haviors" s elect="wwp rogress:En d()" />
        102      </xsl:f or-each>
        103  
        104     </wwfile s:Files>
        105    </xsl:tem plate>
        106  
        107  
        108    <xsl:temp late match ="wwbehavi ors:Paragr aph">
        109     <xsl:par am name="P aramParagr aph" selec t="." />
        110     <xsl:par am name="P aramWif" / >
        111     <xsl:par am name="P aramDocume ntID" />
        112  
        113     <xsl:var iable name ="VarTopic Markers" s elect="$Pa ramParagra ph/wwbehav iors:Marke r[@behavio r = 'topic ' or @beha vior = 'fi lename-and -topic' or  @behavior  = 'topic- descriptio n' or @beh avior = 'c ontext-plu gin']" />
        114  
        115     <xsl:if  test="coun t($VarTopi cMarkers[1 ]) = 1">
        116      <xsl:va riable nam e="VarSpli tId" selec t="$ParamP aragraph/a ncestor::w wbehaviors :Split[1]/ @id" />
        117      
        118      <wwtopi cs:Paragra ph id="{$P aramParagr aph/@id}">
        119  
        120       <xsl:f or-each se lect="$Var TopicMarke rs">
        121        <xsl: variable n ame="VarTo picMarker"  select=". " />
        122        
        123        <wwto pics:Topic  id="{$Var TopicMarke r/@id}" ty pe="{$VarT opicMarker /@behavior }" name="{ $VarTopicM arker/wwdo c:Marker/@ name}" spl itID="{$Va rSplitId}"  documentI D="{$Param DocumentID }">
        124         <wwt opics:Text >
        125          <xs l:for-each  select="$ VarTopicMa rker/wwdoc :Marker">
        126           <x sl:for-eac h select=" wwdoc:Text Run">
        127            < xsl:for-ea ch select= "wwdoc:Tex t">
        128              <xsl:value -of select ="@value"  />
        129            < /xsl:for-e ach>
        130           </ xsl:for-ea ch>
        131          </x sl:for-eac h>
        132         </ww topics:Tex t>
        133        </wwt opics:Topi c>
        134  
        135       </xsl: for-each>
        136       <wwtop ics:Paragr aphText>
        137        <xsl: for-each s elect="$Pa ramWif[1]" >
        138         <xsl :variable  name="VarW ifParagrap h" select= "key('wwdo c-paragrap hs-by-id',  $ParamPar agraph/@id )[1]" />
        139         
        140         <xsl :for-each  select="$V arWifParag raph/wwdoc :Number |  $VarWifPar agraph/wwd oc:TextRun ">
        141          <xs l:for-each  select="w wdoc:Text" >
        142           <x sl:value-o f select=" @value" />
        143          </x sl:for-eac h>
        144         </xs l:for-each >
        145        </xsl :for-each>
        146       </wwto pics:Parag raphText>
        147      </wwtop ics:Paragr aph>
        148     </xsl:if >
        149    </xsl:tem plate>
        150   </xsl:styl esheet>