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

44.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 group.xsl Tue Jun 10 22:53:50 2008 UTC

44.2 Comparison summary

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

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

44.4 Active regular expressions

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

44.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:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
        5                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
        6                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
        7                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"
        8                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"
        9                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
        10                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
        11                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        12                                    xmlns:wwbe haviors="u rn:WebWork s-Behavior s-Schema"
        13                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        14                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"
        15                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"
        16                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        17                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        18                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        19                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        20                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        21                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
        22                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        23                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        24                                    exclude-re sult-prefi xes="xsl m sxsl wwspl its wwtoc  wwlinks ww mode wwfil es wwdoc w wbehaviors  wwproject  wwpage ww locale wwp rogress ww log wwfile system wwu ri wwstrin g wwfilese xt wwproje xt wwexsld oc"
        25   >
        26  
        27    <xsl:para m name="Gl obalInput"  />
        28    <xsl:para m name="Gl obalPipeli neName" />
        29    <xsl:para m name="Gl obalProjec t" />
        30    <xsl:para m name="Gl obalFiles"  />
        31    <xsl:para m name="Pa rameterDep endsType"  />
        32    <xsl:para m name="Pa rameterTyp e" />
        33  
        34    <xsl:name space-alia s styleshe et-prefix= "wwtopics"  result-pr efix="#def ault" />
        35    <xsl:stri p-space el ements="*"  />
        36  
        37    <xsl:key  name="wwfi les-files- by-type" m atch="wwfi les:File"  use="@type " />
        38  
        39    <xsl:vari able name= "GlobalAct ionChecksu m">
        40     <xsl:var iable name ="VarTrans formChecks ums">
        41      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
        42     </xsl:va riable>
        43     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
        44    </xsl:var iable>
        45  
        46    <xsl:temp late match ="/">
        47     <wwfiles :Files ver sion="1.0" >
        48  
        49      <xsl:va riable nam e="VarProj ectGroups"  select="$ GlobalProj ect/wwproj ect:Projec t/wwprojec t:Groups/w wproject:G roup" />
        50      <xsl:va riable nam e="VarProg ressStartG roups" sel ect="wwpro gress:Star t(count($V arProjectG roups))" / >
        51  
        52      <!-- It erate Grou ps -->
        53      <!--                  -->
        54      <xsl:fo r-each sel ect="$VarP rojectGrou ps">
        55       <xsl:v ariable na me="VarPro jectGroup"  select=". " />
        56  
        57       <xsl:v ariable na me="VarPro gressStart Group" sel ect="wwpro gress:Star t(1)" />
        58  
        59       <xsl:f or-each se lect="$Glo balFiles[1 ]">
        60  
        61        <xsl: variable n ame="VarGr oupTopicDo cuments" s elect="key ('wwfiles- files-by-t ype', $Par ameterDepe ndsType)[@ groupID =  $VarProjec tGroup/@Gr oupID]" />
        62  
        63        <!--  Path -->
        64        <!--       -->
        65        <xsl: variable n ame="VarPa th" select ="wwfilesy stem:Combi ne(wwproje xt:GetGrou pDataDirec toryPath($ VarProject Group/@Gro upID), con cat(transl ate($Param eterType,  ':', '_'),  '.xml'))"  />
        66  
        67        <xsl: variable n ame="VarUp ToDate" se lect="wwfi lesext:UpT oDate($Var Path, conc at($Global Project/ww project:Pr oject/@Cha ngeID, ':' , count($V arGroupTop icDocument s)), $VarP rojectGrou p/@GroupID , '', $Glo balActionC hecksum)"  />
        68        <xsl: if test="n ot($VarUpT oDate)">
        69         <xsl :variable  name="VarR esultAsXML ">
        70          <ww topics:Top ics versio n="1.0">
        71           <x sl:for-eac h select=" $VarGroupT opicDocume nts">
        72            < xsl:variab le name="V arFilesTop icDocument " select=" ." />
        73            < xsl:variab le name="V arTopicDoc ument" sel ect="wwexs ldoc:LoadX MLWithoutR esolver($V arFilesTop icDocument /@path)" / >
        74  
        75            < wwtopics:D ocument id ="{$VarTop icDocument /wwtopics: Topics/@do cumentID}" >
        76              <xsl:copy- of select= "$VarTopic Document/w wtopics:To pics/*" />
        77            < /wwtopics: Document>
        78           </ xsl:for-ea ch>
        79          </w wtopics:To pics>
        80         </xs l:variable >
        81         <xsl :variable  name="VarR esult" sel ect="msxsl :node-set( $VarResult AsXML)" />
        82         <xsl :variable  name="VarW riteResult " select=" wwexsldoc: Document($ VarResult,  $VarPath,  wwprojext :GetFormat Setting('e ncoding',  'utf-8'),  'xml', '1. 0', 'yes',  'no', '',  '', '', ' ', 'text/x ml')" />
        83        </xsl :if>
        84  
        85        <wwfi les:File p ath="{$Var Path}" typ e="{$Param eterType}"  checksum= "{wwfilesy stem:GetCh ecksum($Va rPath)}" p rojectchec ksum="{con cat($Globa lProject/w wproject:P roject/@Ch angeID, ': ', count($ VarGroupTo picDocumen ts))}" gro upID="{$Va rProjectGr oup/@Group ID}" docum entID="" a ctioncheck sum="{$Glo balActionC hecksum}">
        86         <xsl :for-each  select="$V arGroupTop icDocument s">
        87          <ww files:Depe nds path=" {@path}" c hecksum="{ @checksum} " groupID= "{@groupID }" documen tID="{@doc umentID}"  />
        88         </xs l:for-each >
        89        </wwf iles:File>
        90  
        91       </xsl: for-each>
        92       <xsl:v ariable na me="VarPro gressEndGr oup" selec t="wwprogr ess:End()"  />
        93      </xsl:f or-each>
        94      <xsl:va riable nam e="VarProg ressEndGro ups" selec t="wwprogr ess:End()"  />
        95     </wwfile s:Files>
        96    </xsl:tem plate>
        97   </xsl:styl esheet>