27. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 16 22:29:57 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.

27.1 Files compared

# Location File Last Modified
1 Thu Oct 16 22:29:57 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Shared\common\pages tables.xsl Mon Oct 13 05:52:00 2008 UTC

27.2 Comparison summary

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

27.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
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

27.4 Active regular expressions

No regular expressions were active.

27.5 Comparison detail

        1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
        2   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
        3                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
        4                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
        5                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
        6                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        7                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
        8                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"
        9                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        10                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        11                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        12                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        13                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        14                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        15                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        16                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        17   >
        18    <xsl:key  name="wwfi les-files- by-type" m atch="wwfi les:File"  use="@type " />
        19    <xsl:key  name="wwfi les-files- by-groupid -type" mat ch="wwfile s:File" us e="concat( @groupID,  ':', @type )" />
        20    <xsl:key  name="wwfi les-files- by-documen tid" match ="wwfiles: File" use= "@document ID" />
        21    <xsl:key  name="wwsp lits-split -by-docume ntid" matc h="wwsplit s:Split" u se="@docum entID" />
        22    <xsl:key  name="wwto c-entry-by -documenti d" match=" wwtoc:Entr y" use="@d ocumentID"  />
        23    <xsl:key  name="wwdo c-tables-b y-id" matc h="wwdoc:T able" use= "@id" />
        24  
        25  
        26    <xsl:temp late name= "Documents Tables">
        27     <xsl:par am name="P aramInput"  />
        28     <xsl:par am name="P aramProjec t" />
        29     <xsl:par am name="P aramFiles"  />
        30     <xsl:par am name="P aramLinksT ype" />
        31     <xsl:par am name="P aramDepend sType" />
        32     <xsl:par am name="P aramSplits Type" />
        33     <xsl:par am name="P aramBehavi orsType" / >
        34     <xsl:par am name="P aramTOCDat aType" />
        35  
        36     <!-- Loa d project  links -->
        37     <!--                      -->
        38     <xsl:for -each sele ct="$Param Files[1]">
        39      <xsl:va riable nam e="VarLink sPath" sel ect="key(' wwfiles-fi les-by-typ e', $Param LinksType) /@path" />
        40      <xsl:va riable nam e="VarLink s" select= "wwexsldoc :LoadXMLWi thoutResol ver($VarLi nksPath)"  />
        41  
        42      <!-- Gr oups -->
        43      <!--         -->
        44      <xsl:va riable nam e="VarProj ectGroups"  select="$ ParamProje ct/wwproje ct:Project /wwproject :Groups/ww project:Gr oup" />
        45      <xsl:va riable nam e="VarProg ressProjec tGroupsSta rt" select ="wwprogre ss:Start(c ount($VarP rojectGrou ps))" />
        46      <xsl:fo r-each sel ect="$VarP rojectGrou ps">
        47       <xsl:v ariable na me="VarPro jectGroup"  select=". " />
        48  
        49       <xsl:v ariable na me="VarPro gressProje ctGroupSta rt" select ="wwprogre ss:Start(1 )" />
        50  
        51       <!-- A borted? -- >
        52       <!--           -- >
        53       <xsl:i f test="no t(wwprogre ss:Abort() )">
        54        <xsl: for-each s elect="$Pa ramFiles[1 ]">
        55         <!--  Group Spl its -->
        56         <!--                -->
        57         <xsl :variable  name="VarF ilesSplits " select=" key('wwfil es-files-b y-groupid- type', con cat($VarPr ojectGroup /@GroupID,  ':', $Par amSplitsTy pe))" />
        58         <xsl :variable  name="VarS plits" sel ect="wwexs ldoc:LoadX MLWithoutR esolver($V arFilesSpl its/@path) " />
        59  
        60         <!--  Group TOC  -->
        61         <!--             -->
        62         <xsl :variable  name="VarF ilesTOCDat a" select= "key('wwfi les-files- by-groupid -type', co ncat($VarP rojectGrou p/@GroupID , ':', $Pa ramTOCData Type))" />
        63         <xsl :variable  name="VarT OCData" se lect="wwex sldoc:Load XMLWithout Resolver($ VarFilesTO CData/@pat h)" />
        64  
        65         <!--  Iterate i nput docum ents -->
        66         <!--                            -->
        67         <xsl :for-each  select="$P aramInput[ 1]">
        68          <xs l:variable  name="Var FilesByTyp e" select= "key('wwfi les-files- by-type',  $ParamDepe ndsType)"  />
        69  
        70          <xs l:variable  name="Var ProgressFi lesStart"  select="ww progress:S tart(count ($VarFiles ByType))"  />
        71  
        72          <xs l:for-each  select="$ VarFilesBy Type">
        73           <x sl:variabl e name="Va rFile" sel ect="." />
        74  
        75           <x sl:variabl e name="Va rProgressF ileStart"  select="ww progress:S tart(1)" / >
        76  
        77           <! -- Aborted ? -->
        78           <! --           -->
        79           <x sl:if test ="not(wwpr ogress:Abo rt())">
        80            < !-- Behavi ors -->
        81            < !--            -->
        82            < xsl:for-ea ch select= "$ParamFil es[1]">
        83              <xsl:varia ble name=" VarBehavio rsFile" se lect="key( 'wwfiles-f iles-by-do cumentid',  $VarFile/ @documentI D)[@type =  $ParamBeh aviorsType ][1]" />
        84              <xsl:varia ble name=" VarBehavio rs" select ="wwexsldo c:LoadXMLW ithoutReso lver($VarB ehaviorsFi le/@path)"  />
        85  
        86              <!-- Call  template - ->
        87              <!--                - ->
        88              <xsl:call- template n ame="Table s">
        89               <xsl:with -param nam e="ParamLi nks" selec t="$VarLin ks" />
        90               <xsl:with -param nam e="ParamFi lesDocumen tNode" sel ect="$VarF ile" />
        91               <xsl:with -param nam e="ParamFi lesSplits"  select="$ VarFilesSp lits" />
        92               <xsl:with -param nam e="ParamSp lits" sele ct="$VarSp lits" />
        93               <xsl:with -param nam e="ParamBe haviorsFil e" select= "$VarBehav iorsFile"  />
        94               <xsl:with -param nam e="ParamBe haviors" s elect="$Va rBehaviors " />
        95               <xsl:with -param nam e="ParamTO CData" sel ect="$VarT OCData" />
        96              </xsl:call -template>
        97            < /xsl:for-e ach>
        98           </ xsl:if>
        99  
        100           <x sl:variabl e name="Va rProgressF ileEnd" se lect="wwpr ogress:End ()" />
        101          </x sl:for-eac h>
        102  
        103          <xs l:variable  name="Var ProgressFi lesEnd" se lect="wwpr ogress:End ()" />
        104         </xs l:for-each >
        105        </xsl :for-each>
        106       </xsl: if>
        107  
        108       <xsl:v ariable na me="VarPro gressProje ctGroupEnd " select=" wwprogress :End()" />
        109      </xsl:f or-each>
        110  
        111      <xsl:va riable nam e="VarProg ressProjec tGroupsEnd " select=" wwprogress :End()" />
        112     </xsl:fo r-each>
        113    </xsl:tem plate>
        114  
        115  
        116    <xsl:temp late name= "Tables">
        117     <xsl:par am name="P aramLinks"  />
        118     <xsl:par am name="P aramFilesD ocumentNod e" />
        119     <xsl:par am name="P aramFilesS plits" />
        120     <xsl:par am name="P aramSplits " />
        121     <xsl:par am name="P aramBehavi orsFile" / >
        122     <xsl:par am name="P aramBehavi ors" />
        123     <xsl:par am name="P aramTOCDat a" />
        124  
        125     <!-- Loa d document  -->
        126     <!--                 -->
        127     <xsl:var iable name ="VarDocum ent" selec t="wwexsld oc:LoadXML WithoutRes olver($Par amFilesDoc umentNode/ @path)" />
        128  
        129     <!-- Bre ak documen t into chu nks -->
        130     <!--                               -->
        131     <xsl:for -each sele ct="$Param Splits[1]" >
        132      <xsl:va riable nam e="VarDocu mentSplits " select=" key('wwspl its-split- by-documen tid', $Par amFilesDoc umentNode/ @documentI D)" />
        133  
        134      <xsl:va lue-of sel ect="wwpro gress:Star t(count($V arDocument Splits))"  />
        135  
        136      <xsl:fo r-each sel ect="$VarD ocumentSpl its">
        137       <xsl:v ariable na me="VarSpl it" select ="." />
        138  
        139       <xsl:v alue-of se lect="wwpr ogress:Sta rt(1)" />
        140  
        141       <!-- A borted? -- >
        142       <!--           -- >
        143       <xsl:i f test="no t(wwprogre ss:Abort() )">
        144        <!--  Process ta bles -->
        145        <!--                  -->
        146        <xsl: variable n ame="VarSp litTables"  select="$ VarSplit/w wsplits:Ta ble" />
        147        <xsl: variable n ame="VarPr ogressTabl esStart" s elect="wwp rogress:St art(count( $VarSplitT ables))" / >
        148        <xsl: for-each s elect="$Va rSplitTabl es">
        149         <xsl :variable  name="VarS plitTable"  select=". " />
        150  
        151         <xsl :variable  name="VarP rogressTab leStart" s elect="wwp rogress:St art(1)" />
        152  
        153         <!--  Content - ->
        154         <!--          - ->
        155         <xsl :for-each  select="$V arDocument [1]">
        156          <xs l:variable  name="Var Content" s elect="key ('wwdoc-ta bles-by-id ', $VarSpl itTable/@i d)" />
        157  
        158          <!- - Table -- >
        159          <!- -       -- >
        160          <xs l:call-tem plate name ="Content- Table">
        161           <x sl:with-pa ram name=" ParamFiles Splits" se lect="$Par amFilesSpl its" />
        162           <x sl:with-pa ram name=" ParamSplit s" select= "$ParamSpl its" />
        163           <x sl:with-pa ram name=" ParamBehav iorsFile"  select="$P aramBehavi orsFile" / >
        164           <x sl:with-pa ram name=" ParamBehav iors" sele ct="$Param Behaviors"  />
        165           <x sl:with-pa ram name=" ParamLinks " select=" $ParamLink s" />
        166           <x sl:with-pa ram name=" ParamTOCDa ta" select ="$ParamTO CData" />
        167           <x sl:with-pa ram name=" ParamFiles DocumentNo de" select ="$ParamFi lesDocumen tNode" />
        168           <x sl:with-pa ram name=" ParamSplit " select=" $VarSplitT able" />
        169           <x sl:with-pa ram name=" ParamDocum ent" selec t="$VarDoc ument" />
        170           <x sl:with-pa ram name=" ParamConte nt" select ="$VarCont ent" />
        171          </x sl:call-te mplate>
        172         </xs l:for-each >
        173  
        174         <xsl :variable  name="VarP rogressTab leEnd" sel ect="wwpro gress:End( )" />
        175        </xsl :for-each>
        176        <xsl: variable n ame="VarPr ogressTabl esEnd" sel ect="wwpro gress:End( )" />
        177       </xsl: if>
        178  
        179       <xsl:v alue-of se lect="wwpr ogress:End ()" />
        180      </xsl:f or-each>
        181  
        182      <xsl:va lue-of sel ect="wwpro gress:End( )" />
        183     </xsl:fo r-each>
        184    </xsl:tem plate>
        185   </xsl:styl esheet>