[H2-commits] r1402 - in humano2/trunk: components/webTools web/portal/site web/portal/site/xsl

[<sv...@de...>]

Author: pcamacho
Date: 2005-06-23 10:54:45 -0400 (Thu, 23 Jun 2005)
New Revision: 1402

Modified:
   humano2/trunk/components/webTools/xmltools.cs
   humano2/trunk/web/portal/site/instance.aspx.cs
   humano2/trunk/web/portal/site/xsl/orderattributes.xsl
Log:
FIX: bug #224. The tag <link> in the attribute file is not copied correct=
ly (</link> missing...). While we don't use=20
this tag, it can't be removed.


Modified: humano2/trunk/components/webTools/xmltools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/webTools/xmltools.cs	2005-06-22 22:36:27 UTC=
 (rev 1401)
+++ humano2/trunk/components/webTools/xmltools.cs	2005-06-23 14:54:45 UTC=
 (rev 1402)
@@ -168,7 +168,7 @@
                +    xmlAttributesList
                +    "</attributesList>"   =20
                + "</dataWithAttributes>";
-            //Logger.Log("xmlWithAttributesList: " + xmlWithAttributesLi=
st,LogLevel.Trace);
+            Logger.Log("xmlWithAttributesList: " + xmlWithAttributesList=
,LogLevel.Trace);
             string res =3D TransformXML(xmlWithAttributesList, xslPath, =
null);
             //Logger.Log("res: " + res,LogLevel.Trace);
            return res;

Modified: humano2/trunk/web/portal/site/instance.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/instance.aspx.cs	2005-06-22 22:36:27 UT=
C (rev 1401)
+++ humano2/trunk/web/portal/site/instance.aspx.cs	2005-06-23 14:54:45 UT=
C (rev 1402)
@@ -173,6 +173,8 @@
             string structure =3D dbAdapter.ReadStructureAndXsls1(idEntit=
y,xslInclude,listAtt); //AQUI
             Logger.Log("structure(before)=3D" +  structure,LogLevel.Trac=
e);
             //Reorder the attributes as they appear in the selected orde=
r (form)
+            Logger.Log("listAtt: " + listAtt,LogLevel.Trace);
+           =20
             structure =3D Humano2.Components.WebTools.Xml.OrderAttribute=
sInDataStructure(structure, listAtt, baseUrl() +"xsl/orderattributes.xsl"=
);
             Logger.Log("structure(after)=3D" +  structure,LogLevel.Trace=
);
             //SVERA string structure =3D dbAdapter.ReadStructureAndXsls1=
(idEntity,xslInclude,formAttribute);

Modified: humano2/trunk/web/portal/site/xsl/orderattributes.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/portal/site/xsl/orderattributes.xsl	2005-06-22 22:3=
6:27 UTC (rev 1401)
+++ humano2/trunk/web/portal/site/xsl/orderattributes.xsl	2005-06-23 14:5=
4:45 UTC (rev 1402)
@@ -15,9 +15,22 @@
                 <xsl:copy-of select=3D"/dataWithAttributes/structure/att=
ribute[id_entity=3D$currentId]" />
             </xsl:for-each>
             <!-- copy what remains -->
-            <xsl:for-each select=3D"/dataWithAttributes/structure/*[name=
()!=3D'class' and name()!=3D'attribute' and name()!=3D'entity']">
+            <xsl:for-each select=3D"/dataWithAttributes/structure/*[name=
()!=3D'class' and name()!=3D'attribute' and name()!=3D'entity' and name()=
!=3D'file']">
                 <xsl:copy-of select=3D"."/>
             </xsl:for-each>
+            <!-- patch because of a big pb with xsl... With link the cop=
y is impossible... So it is replaced by link1-->
+            <!-- The tag <link> cannot be copied correctly (the closing =
tag </link>never appears. So we don't put it... Nevermind we do not
+            use it for the moment...-->
+            <xsl:for-each select=3D"/dataWithAttributes/structure/*[name=
()=3D'file']">
+                <file>
+                    <id_entity>
+                        <xsl:value-of select=3D"id_entity" />
+                    </id_entity>
+                    <maxsize>
+                        <xsl:value-of select=3D"maxsize" />
+                    </maxsize>
+                </file>
+            </xsl:for-each>
         </structure>
 	</xsl:template>
 </xsl:stylesheet>