114. Araxis Merge File Comparison Report

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

114.1 Files compared

# Location File Last Modified
1 Thu Oct 16 22:30:09 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Wiki - MoinMoin\Transforms tables.xsl Mon Oct 13 05:51:50 2008 UTC

114.2 Comparison summary

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

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

114.4 Active regular expressions

No regular expressions were active.

114.5 Comparison detail

        1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
        2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Wiki-Page- Schema"
        3                                    xmlns:wwwi ki="urn:We bWorks-Wik i-Page-Sch ema"
        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:wwmo de="urn:We bWorks-Eng ine-Mode"
        7                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"
        8                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
        9                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        10                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
        11                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"
        12                                    xmlns:wwbe haviors="u rn:WebWork s-Behavior s-Schema"
        13                                    xmlns:wwva rs="urn:We bWorks-Var iables-Sch ema"
        14                                    xmlns:wwno tes="urn:W ebWorks-Fo otnote-Sch ema"
        15                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        16                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"
        17                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"
        18                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        19                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        20                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        21                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        22                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        23                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"
        24                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
        25                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        26                                    xmlns:wwim aging="urn :WebWorks- XSLT-Exten sion-Imagi ng"
        27                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        28                                    exclude-re sult-prefi xes="xsl m sxsl wwmod e wwlinks  wwfiles ww doc wwspli ts wwtoc w wbehaviors  wwvars ww notes wwpr oject wwpa ge wwlocal e wwprogre ss wwlog w wfilesyste m wwuri ww string wwu nits wwfil esext wwpr ojext wwim aging wwex sldoc"
        29   >
        30    <xsl:para m name="Gl obalInput"  />
        31    <xsl:para m name="Gl obalPipeli neName" />
        32    <xsl:para m name="Gl obalProjec t" />
        33    <xsl:para m name="Gl obalFiles"  />
        34    <xsl:para m name="Pa rameterDep endsType"  />
        35    <xsl:para m name="Pa rameterSpl itsType" / >
        36    <xsl:para m name="Pa rameterLin ksType" />
        37    <xsl:para m name="Pa rameterLoc aleType" / >
        38    <xsl:para m name="Pa rameterUIL ocaleType"  />
        39    <xsl:para m name="Pa rameterBeh aviorsType " />
        40    <xsl:para m name="Pa rameterTOC DataType"  />
        41    <xsl:para m name="Pa rameterAll owBaggage"  />
        42    <xsl:para m name="Pa rameterAll owGroupToG roup" />
        43    <xsl:para m name="Pa rameterAll owURL" />
        44    <xsl:para m name="Pa rameterBag gageSplitF ileType" / >
        45    <xsl:para m name="Pa rameterTyp e" />
        46    <xsl:para m name="Pa rameterCat egory" />
        47    <xsl:para m name="Pa rameterUse " />
        48    <xsl:para m name="Pa rameterDep loy" />
        49  
        50  
        51    <xsl:vari able name= "GlobalDef aultNamesp ace" selec t="'urn:We bWorks-Wik i-Page-Sch ema'" />
        52  
        53  
        54    <xsl:outp ut method= "xml" enco ding="UTF- 8" indent= "yes" />
        55    <xsl:name space-alia s styleshe et-prefix= "wwwiki" r esult-pref ix="#defau lt" />
        56    <xsl:pres erve-space  elements= "*" />
        57  
        58  
        59    <xsl:incl ude href=" wwtransfor m:common/a ccessibili ty/images. xsl"/>
        60    <xsl:incl ude href=" wwtransfor m:common/b ehaviors/o ptions.xsl "/>
        61    <xsl:incl ude href=" wwtransfor m:common/i mages/util ities.xsl"  />
        62    <xsl:incl ude href=" wwtransfor m:common/l inks/resol ve.xsl" />
        63    <xsl:incl ude href=" wwtransfor m:common/p ages/table s.xsl" />
        64    <xsl:incl ude href=" wwtransfor m:common/p roject/con ditions.xs l" />
        65    <xsl:incl ude href=" wwtransfor m:common/p roject/pro perties.xs l" />
        66    <xsl:incl ude href=" wwtransfor m:common/t ables/tabl es.xsl" />
        67    <xsl:incl ude href=" wwformat:T ransforms/ css_proper ties.xsl"  />
        68    <xsl:incl ude href=" wwtransfor m:uri/uri. xsl" />
        69    <xsl:incl ude href=" wwformat:T ransforms/ moinmoin.x sl" />
        70    <xsl:incl ude href=" wwformat:T ransforms/ content.xs l" />
        71  
        72  
        73    <xsl:vari able name= "GlobalAct ionChecksu m">
        74     <xsl:var iable name ="VarTrans formChecks ums">
        75      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
        76      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/access ibility/im ages.xsl') , ':', wwf ilesystem: GetChecksu m(wwuri:As FilePath(' wwtransfor m:common/a ccessibili ty/images. xsl')))" / >
        77      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/behavi ors/option s.xsl'), ' :', wwfile system:Get Checksum(w wuri:AsFil ePath('wwt ransform:c ommon/beha viors/opti ons.xsl')) )" />
        78      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/images /utilities .xsl'), ': ', wwfiles ystem:GetC hecksum(ww uri:AsFile Path('wwtr ansform:co mmon/image s/utilitie s.xsl')))"  />
        79      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/links/ resolve.xs l'), ':',  wwfilesyst em:GetChec ksum(wwuri :AsFilePat h('wwtrans form:commo n/links/re solve.xsl' )))" />
        80      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/pages/ tables.xsl '), ':', w wfilesyste m:GetCheck sum(wwuri: AsFilePath ('wwtransf orm:common /pages/tab les.xsl')) )" />
        81      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/projec t/conditio ns.xsl'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: common/pro ject/condi tions.xsl' )))" />
        82      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/projec t/properti es.xsl'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: common/pro ject/prope rties.xsl' )))" />
        83      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:com mon/tables /tables.xs l'), ':',  wwfilesyst em:GetChec ksum(wwuri :AsFilePat h('wwtrans form:commo n/tables/t ables.xsl' )))" />
        84      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwfor mat:Transf orms/css_p roperties. xsl'), ':' , wwfilesy stem:GetCh ecksum(wwu ri:AsFileP ath('wwfor mat:Transf orms/css_p roperties. xsl')))" / >
        85      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwtra nsform:uri /uri.xsl') , ':', wwf ilesystem: GetChecksu m(wwuri:As FilePath(' wwtransfor m:uri/uri. xsl')))" / >
        86      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwfor mat:Transf orms/moinm oin.xsl'),  ':', wwfi lesystem:G etChecksum (wwuri:AsF ilePath('w wformat:Tr ansforms/m oinmoin.xs l')))" />
        87      <xsl:va lue-of sel ect="conca t(',', wwu ri:AsFileP ath('wwfor mat:Transf orms/conte nt.xsl'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww format:Tra nsforms/co ntent.xsl' )))" />
        88     </xsl:va riable>
        89     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
        90    </xsl:var iable>
        91  
        92  
        93    <!-- Loca le -->
        94    <!--         -->
        95    <xsl:vari able name= "GlobalLoc alePath">
        96     <xsl:for -each sele ct="$Globa lFiles[1]" >
        97      <xsl:va lue-of sel ect="key(' wwfiles-fi les-by-typ e', $Param eterLocale Type)[1]/@ path" />
        98     </xsl:fo r-each>
        99    </xsl:var iable>
        100    <xsl:vari able name= "GlobalLoc ale" selec t="wwexsld oc:LoadXML WithoutRes olver($Glo balLocaleP ath)" />
        101  
        102  
        103    <!-- UI L ocale -->
        104    <!--            -->
        105    <xsl:vari able name= "GlobalUIL ocalePath" >
        106     <xsl:for -each sele ct="$Globa lFiles[1]" >
        107      <xsl:va lue-of sel ect="key(' wwfiles-fi les-by-typ e', $Param eterUILoca leType)[1] /@path" />
        108     </xsl:fo r-each>
        109    </xsl:var iable>
        110    <xsl:vari able name= "GlobalUIL ocalePathC hecksum" s elect="wwf ilesystem: GetChecksu m($GlobalU ILocalePat h)" />
        111    <xsl:vari able name= "GlobalUIL ocale" sel ect="wwexs ldoc:LoadX MLWithoutR esolver($G lobalUILoc alePath)"  />
        112  
        113  
        114    <!-- Mapp ing Entry  Sets -->
        115    <!--                      -->
        116    <xsl:vari able name= "GlobalMap EntrySetsP ath" selec t="wwuri:A sFilePath( 'wwformat: Transforms /mapentrys ets.xml')"  />
        117    <xsl:vari able name= "GlobalMap EntrySets"  select="w wexsldoc:L oadXMLWith outResolve r($GlobalM apEntrySet sPath)" />
        118  
        119  
        120    <xsl:temp late match ="/">
        121     <wwfiles :Files ver sion="1.0" >
        122  
        123      <xsl:ca ll-templat e name="Do cumentsTab les">
        124       <xsl:w ith-param  name="Para mInput" se lect="$Glo balInput"  />
        125       <xsl:w ith-param  name="Para mProject"  select="$G lobalProje ct" />
        126       <xsl:w ith-param  name="Para mFiles" se lect="$Glo balFiles"  />
        127       <xsl:w ith-param  name="Para mLinksType " select=" $Parameter LinksType"  />
        128       <xsl:w ith-param  name="Para mDependsTy pe" select ="$Paramet erDependsT ype" />
        129       <xsl:w ith-param  name="Para mSplitsTyp e" select= "$Paramete rSplitsTyp e" />
        130       <xsl:w ith-param  name="Para mBehaviors Type" sele ct="$Param eterBehavi orsType" / >
        131       <xsl:w ith-param  name="Para mTOCDataTy pe" select ="$Paramet erTOCDataT ype" />
        132      </xsl:c all-templa te>
        133  
        134     </wwfile s:Files>
        135    </xsl:tem plate>
        136  
        137  
        138    <xsl:temp late name= "Content-T able">
        139     <xsl:par am name="P aramFilesS plits" />
        140     <xsl:par am name="P aramSplits " />
        141     <xsl:par am name="P aramBehavi orsFile" / >
        142     <xsl:par am name="P aramBehavi ors" />
        143     <xsl:par am name="P aramLinks"  />
        144     <xsl:par am name="P aramTOCDat a" />
        145     <xsl:par am name="P aramFilesD ocumentNod e" />
        146     <xsl:par am name="P aramSplit"  />
        147     <xsl:par am name="P aramDocume nt" />
        148     <xsl:par am name="P aramConten t" />
        149  
        150     <!-- Out put -->
        151     <!--         -->
        152     <xsl:var iable name ="VarUpToD ate" selec t="wwfiles ext:UpToDa te($ParamS plit/@path , $GlobalP roject/wwp roject:Pro ject/@Chan geID, $Par amSplit/@g roupID, $P aramSplit/ @documentI D, $Global ActionChec ksum)" />
        153     <xsl:if  test="not( $VarUpToDa te)">
        154      <xsl:va riable nam e="VarResu ltAsXML">
        155       <!-- W ikified gr oup name - ->
        156       <!--                       - ->
        157       <xsl:v ariable na me="VarWik ifiedGroup Name">
        158        <xsl: call-templ ate name=" MoinMoin-W ikifyPathC omponent">
        159         <xsl :with-para m name="Pa ramPathCom ponent" se lect="wwpr ojext:GetG roupName($ ParamSplit /@groupID) " />
        160        </xsl :call-temp late>
        161       </xsl: variable>
        162  
        163       <!-- O utput dire ctory path  -->
        164       <!--                          -->
        165       <xsl:v ariable na me="VarOut putDirecto ryPath" se lect="wwfi lesystem:C ombine(wwp rojext:Get TargetOutp utDirector yPath(), $ VarWikifie dGroupName )" />
        166  
        167       <!-- T able page  -->
        168       <!--              -->
        169       <xsl:v ariable na me="VarTab lePageAsXM L">
        170        <wwbe haviors:Ta blePage />
        171       </xsl: variable>
        172       <xsl:v ariable na me="VarTab lePage" se lect="msxs l:node-set ($VarTable PageAsXML) " />
        173  
        174       <!-- C argo -->
        175       <!--        -->
        176       <xsl:v ariable na me="VarCar go" select ="$ParamBe haviors |  $VarTableP age" />
        177  
        178       <!-- M ap common  characters  -->
        179       <!--                          -->
        180       <wwexs ldoc:Mappi ngContext>
        181        <xsl: copy-of se lect="$Glo balMapEntr ySets/wwex sldoc:MapE ntrySets/w wexsldoc:M apEntrySet [@name = ' common']/w wexsldoc:M apEntry" / >
        182  
        183        <!--  Content -- >
        184        <!--          -- >
        185        <xsl: call-templ ate name=" Content-Co ntent">
        186         <xsl :with-para m name="Pa ramContent " select=" $ParamCont ent" />
        187         <xsl :with-para m name="Pa ramSplits"  select="$ ParamSplit s" />
        188         <xsl :with-para m name="Pa ramCargo"  select="$V arCargo" / >
        189         <xsl :with-para m name="Pa ramLinks"  select="$P aramLinks"  />
        190         <xsl :with-para m name="Pa ramTOCData " select=" $ParamTOCD ata" />
        191         <xsl :with-para m name="Pa ramSplit"  select="$P aramSplit"  />
        192        </xsl :call-temp late>
        193       </wwex sldoc:Mapp ingContext >
        194      </xsl:v ariable>
        195  
        196      <!-- Ab orted? -->
        197      <!--           -->
        198      <xsl:if  test="not (wwprogres s:Abort()) ">
        199       <xsl:v ariable na me="VarRes ult" selec t="msxsl:n ode-set($V arResultAs XML)" />
        200       <xsl:v ariable na me="VarWri teResult"  select="ww exsldoc:Do cument($Va rResult, $ ParamSplit /@path, ww projext:Ge tFormatSet ting('enco ding'), 't ext')" />
        201      </xsl:i f>
        202     </xsl:if >
        203  
        204     <!-- Abo rted? -->
        205     <!--           -->
        206     <xsl:if  test="not( wwprogress :Abort())" >
        207      <!-- Re cord files  -->
        208      <!--                -->
        209      <wwfile s:File pat h="{$Param Split/@pat h}" type=" {$Paramete rType}" ch ecksum="{w wfilesyste m:GetCheck sum($Param Split/@pat h)}" proje ctchecksum ="{$Global Project/ww project:Pr oject/@Cha ngeID}" gr oupID="{$P aramSplit/ @groupID}"  documentI D="{$Param Split/@doc umentID}"  actionchec ksum="{$Gl obalAction Checksum}"  category= "{$Paramet erCategory }" use="{$ ParameterU se}" deplo y="{$Param eterDeploy }">
        210       <wwfil es:Depends  path="{$G lobalLocal ePath}" ch ecksum="{w wfilesyste m:GetCheck sum($Globa lLocalePat h)}" group ID="" docu mentID=""  />
        211       <wwfil es:Depends  path="{$G lobalUILoc alePath}"  checksum=" {wwfilesys tem:GetChe cksum($Glo balUILocal ePath)}" g roupID=""  documentID ="" />
        212       <wwfil es:Depends  path="{$G lobalMapEn trySetsPat h}" checks um="{wwfil esystem:Ge tChecksum( $GlobalMap EntrySetsP ath)}" gro upID="" do cumentID=" " />
        213       <wwfil es:Depends  path="{$P aramFilesD ocumentNod e/@path}"  checksum=" {$ParamFil esDocument Node/@chec ksum}" gro upID="{$Pa ramFilesDo cumentNode /@groupID} " document ID="{$Para mFilesDocu mentNode/@ documentID }" />
        214       <wwfil es:Depends  path="{$P aramFilesS plits/@pat h}" checks um="{$Para mFilesSpli ts/@checks um}" group ID="{$Para mFilesSpli ts/@groupI D}" docume ntID="{$Pa ramFilesSp lits/@docu mentID}" / >
        215       <wwfil es:Depends  path="{$P aramBehavi orsFile/@p ath}" chec ksum="{$Pa ramBehavio rsFile/@ch ecksum}" g roupID="{$ ParamBehav iorsFile/@ groupID}"  documentID ="{$ParamB ehaviorsFi le/@docume ntID}" />
        216      </wwfil es:File>
        217     </xsl:if >
        218    </xsl:tem plate>
        219   </xsl:styl esheet>