[H2-commits] r1404 - in humano2/trunk: core/schema/pgsql web/portal/site/xsl

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: pcamacho
Date: 2005-06-23 12:10:47 -0400 (Thu, 23 Jun 2005)
New Revision: 1404

Modified:
   humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
   humano2/trunk/core/schema/pgsql/pgsql-9-HelpDeskSMB.sql
   humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql
   humano2/trunk/web/portal/site/xsl/orderattributes.xsl
Log:
FIX: bug #224. Good version: the guilty column "link" has been changed to=
 "linked" into the metamodel.


Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=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/core/schema/pgsql/pgsql-1-metadata.sql	2005-06-23 15:27=
:35 UTC (rev 1403)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql	2005-06-23 16:10=
:47 UTC (rev 1404)
@@ -110,7 +110,7 @@
 	"maxsize"	integer		NOT NULL,	-- Tamano maximo para subir en Kilobytes.
 	"path"		Varchar(50),			-- Ubicacion en el sistema de archivos.
 	"extensions" Varchar(50),			-- Extenciones de archivos permitidos.
-	"link" Boolean,					    -- FIXME
+    "linked" Boolean,					-- CAREFUL!! Don't put "link" for this column:=
 causes problem with xsl then
  primary key ("id_entity")
 );
=20
@@ -452,7 +452,7 @@
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (83,39,'maxsize=
','maxsize',1,'f','t','f','t','f','f','f','t',null);
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (84,39,'path','=
path',2,'f','t','f','t','f','t','f','t',null);
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (85,39,'extensi=
ons','extensions',0,'f','t','f','t','f','f','f','t',null);
-INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (86,39,'link','=
link',4,'f','t','f','t','f','f','f','t',null);
+INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (86,39,'linked'=
,'linked',4,'f','t','f','t','f','f','f','t',null);
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (102,2,'isAbstr=
act','isAbstract',5,'f','t','f','f','f','f','f','t',null);
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (103,5,'sysAttN=
ame','sysName',0,'t','t','f','f','f','f','f','t',null);
 INSERT INTO "attribute"  ("id_entity","classId","sysAttName","attName","=
order","isObligatory","isActive","isSearchable","isEditable","isSelfLooku=
p","isPrimary","isUnique","protection","display")  VALUES (104,3,'createD=
ate','createDate',0,'f','t','f','f','f','f','f','t',null);

Modified: humano2/trunk/core/schema/pgsql/pgsql-9-HelpDeskSMB.sql
=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/core/schema/pgsql/pgsql-9-HelpDeskSMB.sql	2005-06-23 15=
:27:35 UTC (rev 1403)
+++ humano2/trunk/core/schema/pgsql/pgsql-9-HelpDeskSMB.sql	2005-06-23 16=
:10:47 UTC (rev 1404)
@@ -143,7 +143,7 @@
 INSERT INTO "dateTime" (id_entity, format, "dispHours", custom) VALUES (=
10209, NULL, NULL, NULL);
=20
=20
-INSERT INTO file (id_entity, maxsize, path, extensions, link) VALUES (10=
193, 100000, NULL, NULL, true);
+INSERT INTO file (id_entity, maxsize, path, extensions, linked) VALUES (=
10193, 100000, NULL, NULL, true);
=20
=20
 INSERT INTO folder (id_entity, "folderName", "folderParent", "folderForm=
s") VALUES (10211, 'Assets', 0, '10167');

Modified: humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql
=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/core/schema/pgsql/pgsql-Beta6patch.sql	2005-06-23 15:27=
:35 UTC (rev 1403)
+++ humano2/trunk/core/schema/pgsql/pgsql-Beta6patch.sql	2005-06-23 16:10=
:47 UTC (rev 1404)
@@ -11,6 +11,14 @@
 INSERT INTO "numeric"  ("id_entity","decimals","max","min","default")  V=
ALUES (157,4,NULL,NULL,200); -- pertinence width
 INSERT INTO "numeric"  ("id_entity","decimals","max","min","default")  V=
ALUES (158,4,NULL,NULL,200); -- pertinence height
=20
+--Change name of attribute link of file to linked
+alter table "file" rename column "link" to "linked";
+update "attribute" set "sysAttName"=3D'linked' where "id_entity"=3D86;=20
+update "attribute" set "attName"=3D'linked' where "id_entity"=3D86;
+delete from "file" where "id_entity"=3D10193;
+INSERT INTO file (id_entity, maxsize, path, extensions, linked) VALUES (=
10193, 100000, NULL, NULL, true);
=20
=20
=20
+
+

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-23 15:2=
7:35 UTC (rev 1403)
+++ humano2/trunk/web/portal/site/xsl/orderattributes.xsl	2005-06-23 16:1=
0:47 UTC (rev 1404)
@@ -15,22 +15,9 @@
                 <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' and name()=
!=3D'file']">
+            <xsl:for-each select=3D"/dataWithAttributes/structure/*[name=
()!=3D'class' and name()!=3D'attribute' and name()!=3D'entity']">
                 <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>



