[Spidertree-cvs] spidertree/db spidertree.PGModel,1.3,1.4 spidertree_create.sql,1.3,1.4
Status: Pre-Alpha
Brought to you by:
spiderr
|
From: <sp...@us...> - 2004-02-09 06:26:12
|
Update of /cvsroot/spidertree/spidertree/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20017/db Modified Files: spidertree.PGModel spidertree_create.sql Log Message: uploads now working, thumbnailing still non-existent Index: spidertree.PGModel =================================================================== RCS file: /cvsroot/spidertree/spidertree/db/spidertree.PGModel,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- spidertree.PGModel 8 Feb 2004 02:09:44 -0000 1.3 +++ spidertree.PGModel 9 Feb 2004 06:23:02 -0000 1.4 @@ -65,14 +65,16 @@ <PGIndexColumn OID="1" Order="" Name="user_id" NextOID="1" /> </PGIndex> </PGTable> - <PGTable width="201" x="511" TextField="2" Align="68" y="41" LineColor="#000000" FillStyle="Solid" LineWidth="1" FontUnderline="0" FillColor="#ffffff" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="5" height="247" FontBold="0" FontItalic="0" ScriptCreate="1" TextFlag="2048" FontStrikeOut="0" Name="image" id="0x8483020" NextOID="13" ScriptCreateDrop="1" FontFamily="Sans" > - <sink x="0.120773" y="0.931174" OID="12" id="0x84dbb68" /> + <PGTable width="201" x="511" TextField="2" Align="68" y="41" LineColor="#000000" FillStyle="Solid" LineWidth="1" FontUnderline="0" FillColor="#ffffff" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="5" height="247" FontBold="0" FontItalic="0" ScriptCreate="1" TextFlag="2048" FontStrikeOut="0" Name="image" id="0x8483020" NextOID="16" ScriptCreateDrop="1" FontFamily="Sans" > + <sink x="0.0348259" y="0.048583" OID="15" id="0x8485300" /> <sink x="0.0879121" y="0.0836653" OID="7" id="0x84bbeb0" /> <PGColumn PrimaryKey="1" OID="2" DataType="integer" Name="image_id" NextOID="1" Mandatory="1" /> <PGColumn ForeignKey="1" OID="8" DataType="integer" Name="user_id" NextOID="1" Mandatory="1" /> - <PGColumn OID="9" DataType="timestamp" Name="create_date" Default="'now'" NextOID="1" /> - <PGColumn OID="10" DataType="timestamp" Name="modify_date" Default="'now'" NextOID="1" /> + <PGColumn OID="9" DataType="timestamp" Name="create_date" Default="'now'" NextOID="1" Mandatory="1" /> + <PGColumn OID="10" DataType="timestamp" Name="modify_date" Default="'now'" NextOID="1" Mandatory="1" /> <PGColumn OID="11" DataType="integer" Name="size" NextOID="1" Mandatory="1" /> + <PGColumn OID="13" DataType="integer" Name="x" NextOID="1" Mandatory="1" /> + <PGColumn OID="14" DataType="integer" Name="y" NextOID="1" Mandatory="1" /> <PGColumn OID="3" Length="256" DataType="varchar" Name="file_name" NextOID="1" Mandatory="1" /> <PGColumn OID="4" Length="256" DataType="varchar" Name="title" NextOID="1" Mandatory="1" /> <PGColumn OID="5" DataType="text" Name="descr" NextOID="1" /> @@ -94,7 +96,7 @@ <point x="373" y="61" OID="2" id="0x8548520" /> <point x="528" y="61" sinkobjectid="0x8483020" OID="3" id="0x85ec498" sinkid="0x84bbeb0" /> <texthandle x="0.0447761" y="0.243243" OID="4" /> - <ColumnRef OID="5" Child="album_id" Parent="image_id" NextOID="1" /> + <ColumnRef OID="5" Child="image_id" Parent="image_id" NextOID="1" /> </PGReference> <PGReference TextField="3" Align="68" LineColor="#000000" FillStyle="none" LineWidth="1" EndArrowDirection="41" EndArrowType="2" FontUnderline="0" FillColor="#000000" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="3" BeginArrowDirection="0" BeginArrowType="0" FontBold="0" Child="album_map" FontItalic="0" ScriptCreate="1" Parent="album" EndTruncate="1" TextFlag="2048" FontStrikeOut="0" Name="album_map_album_ref" BeginTruncate="1" id="0x8555d28" NextOID="6" ScriptCreateDrop="1" FontFamily="Sans" > <point x="347" y="106" sinkobjectid="0x8624950" OID="1" id="0x8615d58" sinkid="0x854c2e8" /> @@ -103,20 +105,23 @@ <texthandle x="0.171233" y="0.326087" OID="4" /> <ColumnRef OID="5" Child="album_id" Parent="album_id" NextOID="1" /> </PGReference> - <PGTable width="201" x="511" TextField="2" Align="68" y="335" LineColor="#000000" FillStyle="Solid" LineWidth="1" FontUnderline="0" FillColor="#ffffff" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="9" height="97" FontBold="0" FontItalic="0" ScriptCreate="1" TextFlag="2048" FontStrikeOut="0" Name="thumbnail_queue" id="0x861a328" NextOID="8" ScriptCreateDrop="1" FontFamily="Sans" > - <sink x="0.124378" y="0.0927835" OID="7" id="0x86901c0" /> + <PGTable width="201" x="260" TextField="2" Align="68" y="186" LineColor="#000000" FillStyle="Solid" LineWidth="1" FontUnderline="0" FillColor="#ffffff" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="9" height="117" FontBold="0" FontItalic="0" ScriptCreate="1" TextFlag="2048" FontStrikeOut="0" Name="thumbnail_queue" id="0x861a328" NextOID="10" ScriptCreateDrop="1" FontFamily="Sans" > + <sink x="0.482587" y="0.179487" OID="9" id="0x856b940" /> <PGColumn PrimaryKey="1" ForeignKey="1" OID="2" DataType="integer" Name="image_id" NextOID="1" Mandatory="1" /> <PGColumn OID="3" DataType="timestamp" Name="create_date" Default="'now'" NextOID="1" Mandatory="1" ><![CDATA[Date inserted into the queue]]></PGColumn> <PGColumn OID="4" DataType="timestamp" Name="begin_date" NextOID="1" /> <PGColumn OID="5" DataType="timestamp" Name="end_date" NextOID="1" /> + <PGColumn OID="8" DataType="integer" Name="resize_original" NextOID="1" ><![CDATA[if the original image is to be resized, this holds that max pixel dimensions in X & Y]]></PGColumn> <PGIndex Unique="1" OID="6" Name="thumbnail_queue_image_id_idx" NextOID="2" > <PGIndexColumn OID="1" Order="" Name="image_id" NextOID="1" /> </PGIndex> </PGTable> - <PGReference TextField="3" Align="68" LineColor="#000000" FillStyle="none" LineWidth="1" EndArrowDirection="1108554241" EndArrowType="2" FontUnderline="0" FillColor="#000000" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="8" BeginArrowDirection="136613992" BeginArrowType="0" FontBold="0" Child="thumbnail_queue" FontItalic="0" ScriptCreate="1" Parent="image" EndTruncate="1" TextFlag="2048" FontStrikeOut="0" Name="thumbnail_queue_image_ref" BeginTruncate="1" id="0x8699058" NextOID="5" ScriptCreateDrop="1" FontFamily="Sans" > - <point x="536" y="344" sinkobjectid="0x861a328" OID="1" id="0x84d8ec8" sinkid="0x86901c0" /> - <point x="535" y="271" sinkobjectid="0x8483020" OID="2" id="0x84d0b08" sinkid="0x84dbb68" /> - <texthandle x="6" y="0.608247" OID="3" /> + <PGReference TextField="3" Align="68" LineColor="#000000" FillStyle="none" LineWidth="1" EndArrowDirection="1108554241" EndArrowType="2" FontUnderline="0" FillColor="#000000" LineStyle="Solid" FontColor="#000000" FontPointSize="9" OID="8" BeginArrowDirection="136613992" BeginArrowType="0" FontBold="0" Child="thumbnail_queue" FontItalic="0" ScriptCreate="1" Parent="image" EndTruncate="1" TextFlag="2048" FontStrikeOut="0" Name="thumbnail_queue_image_ref" BeginTruncate="1" id="0x8699058" NextOID="7" ScriptCreateDrop="1" FontFamily="Sans" > + <point x="357" y="207" sinkobjectid="0x861a328" OID="1" id="0x84d8ec8" sinkid="0x856b940" /> + <point x="356" y="161" OID="5" id="0x8573e30" /> + <point x="472" y="161" OID="6" id="0x856ca78" /> + <point x="518" y="53" sinkobjectid="0x8483020" OID="2" id="0x84d0b08" sinkid="0x8485300" /> + <texthandle x="0.0434783" y="0.792453" OID="3" /> <ColumnRef OID="4" Child="image_id" Parent="image_id" NextOID="1" /> </PGReference> </PGModel> Index: spidertree_create.sql =================================================================== RCS file: /cvsroot/spidertree/spidertree/db/spidertree_create.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- spidertree_create.sql 8 Feb 2004 02:09:44 -0000 1.3 +++ spidertree_create.sql 9 Feb 2004 06:23:02 -0000 1.4 @@ -56,9 +56,11 @@ ( image_id integer NOT NULL, user_id integer NOT NULL, - create_date timestamp DEFAULT 'now', - modify_date timestamp DEFAULT 'now', + create_date timestamp NOT NULL DEFAULT 'now', + modify_date timestamp NOT NULL DEFAULT 'now', size integer NOT NULL, + x integer NOT NULL, + y integer NOT NULL, file_name varchar(256) NOT NULL, title varchar(256) NOT NULL, descr text, @@ -80,7 +82,7 @@ ); ALTER TABLE album_map ADD CONSTRAINT album_map_image_ref - FOREIGN KEY ( album_id ) + FOREIGN KEY ( image_id ) REFERENCES image ( image_id ) NOT DEFERRABLE; ALTER TABLE album_map ADD CONSTRAINT album_map_album_ref @@ -94,9 +96,11 @@ create_date timestamp NOT NULL DEFAULT 'now', begin_date timestamp, end_date timestamp, + resize_original integer, PRIMARY KEY (image_id) ); COMMENT ON COLUMN thumbnail_queue.create_date IS 'Date inserted into the queue'; +COMMENT ON COLUMN thumbnail_queue.resize_original IS 'if the original image is to be resized, this holds that max pixel dimensions in X & Y'; CREATE UNIQUE INDEX thumbnail_queue_image_id_idx ON thumbnail_queue ( image_id |