. Neue Datenbankstruktur(-Grafik)

 . Impressum eingefuehrt
 . Hauptseitentext angehuebscht
 . Datenbankstruktur + Beispieldaten aufgenommen
 . Semantik der Datenbankfelder

diff --git a/Styles/infocon.style b/Styles/infocon.style
index f09c7cf..a23b26d 100644 (file)
--- a/Styles/infocon.style
+++ b/Styles/infocon.style
@@ -19,7 +19,7 @@
 #
 <define-tag page-footer>
 # &copy; = &#169;
 #
 <define-tag page-footer>
 # &copy; = &#169;

-<font face="Helvetica,Arial">&copy; <a href="http://infocon.infodrom.org/">InfoCon</a>, <:
+<font face="Helvetica,Arial">&copy; <a href="<root_prefix>impressum.html">InfoCon</a>, <:

 @months =
 #    ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
     ("Dummy", "Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember");
 @months =
 #    ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
     ("Dummy", "Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember");

diff --git a/misc/inserts b/misc/inserts
new file mode 100644 (file)
index 0000000..ef5e50c
--- /dev/null
+++ b/misc/inserts
@@ -0,0 +1,40 @@
+INSERT INTO article VALUES ('10100101','T-Shirt Motiv "Debian"','T-Shirt aus 100% Baumwolle, 180g stark, Aufdruck per Siebdruckverfahren','',0,0,'no comment',16);
+INSERT INTO article VALUES ('10100102','T-Shirt Motiv "GNU"','T-Shirt aus 100% Baumwolle, 180g stark, Aufdruck per Siebdruckverfahren','',0,0,'no comment',16);
+INSERT INTO article VALUES ('10100103','Kaffeetasse weiß, Motiv "GNU"','Porzellantasse, 0.2l, Aufdruck per Siebdruckverfahren','',0,0,'no comment',16);
+
+INSERT INTO offer VALUES ('1010010101','10100101','Größe XS',30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010102','10100101','Größe S' ,30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010103','10100101','Größe M' ,30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010104','10100101','Größe L' ,30.0,30.0,0.5,0.1,'no comment',25.5,14.95);
+INSERT INTO offer VALUES ('1010010105','10100101','Größe XL' ,30.0,30.0,0.5,0.1,'no comment',25.5,14.95);
+
+INSERT INTO offer VALUES ('1010010201','10100102','Größe XS',30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010202','10100102','Größe S' ,30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010203','10100102','Größe M' ,30.0,30.0,0.5,0.1,'no comment',25,14.95);
+INSERT INTO offer VALUES ('1010010204','10100102','Größe L' ,30.0,30.0,0.5,0.1,'no comment',25.5,14.95);
+INSERT INTO offer VALUES ('1010010205','10100102','Größe XL' ,30.0,30.0,0.5,0.1,'no comment',25.5,14.95);
+
+INSERT INTO offer VALUES ('1010010301','10100103','1 Tasse',30.0,30.0,0.5,0.1,'no comment',9.95,8.95);
+INSERT INTO offer VALUES ('1010010302','10100103','6 Tassen' ,30.0,30.0,0.5,0.1,'no comment',57.95,53.70);
+INSERT INTO offer VALUES ('1010010303','10100103','12 Tassen' ,30.0,30.0,0.5,0.1,'no comment',110.50,107.40);
+
+INSERT INTO spool VALUES ('1010010101',10,2);
+INSERT INTO spool VALUES ('1010010102',20,2);
+INSERT INTO spool VALUES ('1010010103',34,6);
+
+INSERT INTO customer VALUES (1,'','Martin','Schulze','','Am Zollbaum 7','26129','Oldenburg','Germany','','fips');
+INSERT INTO customer VALUES (2,'','Juergen','Schulze','','Dorfmark 10','26389','Wilhelmshaven','Germany','','hurz');
+
+INSERT INTO dispatch VALUES (1,1,'Fri 04 Dec 00:00:00 1998 CET',3);
+INSERT INTO dispatch VALUES (2,2,'Thu 03 Dec 00:00:00 1998 CET',2);
+INSERT INTO dispatch VALUES (3,2,'Sun 06 Dec 00:00:00 1998 CET',0);
+
+INSERT INTO dispatchlist VALUES (1,'1010010101',1,25.0);
+INSERT INTO dispatchlist VALUES (1,'1010010102',1,25.0);
+INSERT INTO dispatchlist VALUES (1,'1010010103',1,25.0);
+
+INSERT INTO dispatchlist VALUES (2,'1010010101',2,25.0);
+INSERT INTO dispatchlist VALUES (2,'1010010103',1,25.0);
+
+INSERT INTO dispatchlist VALUES (3,'1010010103',4,25.0);
+

diff --git a/misc/overview.fig b/misc/overview.fig
index b46ef03..fa0360b 100644 (file)
--- a/misc/overview.fig
+++ b/misc/overview.fig
@@ -3,7 +3,7 @@ Landscape
 Center
 Metric
 A4      
 Center
 Metric
 A4      

-100.00
+83.00

 Single
 -2
 1200 2
 Single
 -2
 1200 2


@@ -33,62 +33,79 @@ Single
         3845 3455 4580 3455
 4 0 0 50 0 18 12 0.0000 4 135 855 3855 3660 Customer\001
 4 0 0 50 0 18 12 0.0000 4 135 420 3855 3885 Date\001
         3845 3455 4580 3455
 4 0 0 50 0 18 12 0.0000 4 135 855 3855 3660 Customer\001
 4 0 0 50 0 18 12 0.0000 4 135 420 3855 3885 Date\001

-4 0 0 50 0 18 12 0.0000 4 135 705 3855 3435 OrderID\001
+4 0 0 50 0 18 12 0.0000 4 180 780 3855 3435 Dispatch\001

 4 0 0 50 0 18 12 0.0000 4 135 600 3855 4110 Status\001
 4 0 0 50 0 18 12 0.0000 4 135 330 3855 4335 Tax\001
 4 0 0 50 0 18 12 0.0000 4 135 600 3855 4110 Status\001
 4 0 0 50 0 18 12 0.0000 4 135 330 3855 4335 Tax\001

-4 1 0 50 0 18 16 0.0000 4 180 675 4440 3075 Order\001
+4 1 0 50 0 18 16 0.0000 4 240 1035 4440 3075 Dispatch\001

 -6
 -6

-6 7890 2730 9585 4785
+6 13710 3855 15420 5129

 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2

-        7905 3195 9570 3195
+        13740 4305 15405 4305

 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5
 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5

-        9570 4770 7905 4770 7905 2745 9570 2745 9570 4770
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-        8130 3440 8585 3440
-4 0 0 50 0 18 12 0.0000 4 135 510 8130 3645 Name\001
-4 0 0 50 0 18 12 0.0000 4 180 1005 8130 3870 Description\001
-4 0 0 50 0 18 12 0.0000 4 135 465 8130 3420 ArtID\001
-4 0 0 50 0 18 12 0.0000 4 135 630 8130 4095 Picture\001
-4 0 0 50 0 18 12 0.0000 4 135 630 8130 4320 HxWxD\001
-4 0 0 50 0 18 12 0.0000 4 135 450 8130 4545 Price\001
-4 1 0 50 0 18 16 0.0000 4 180 765 8715 3060 Article\001
+        15390 5114 13725 5114 13725 3870 15390 3870 15390 5114
+4 0 0 50 0 18 12 0.0000 4 180 1095 13950 4995 count_spare\001
+4 0 0 50 0 18 12 0.0000 4 135 765 13950 4545 ArticleID\001
+4 1 0 50 0 18 16 0.0000 4 240 675 14535 4185 Spool\001
+4 0 0 50 0 18 12 0.0000 4 180 1065 13965 4755 count_order\001

 -6
 -6

-6 10365 1155 12060 2535
+6 6288 4061 7983 5728

 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2

-        10380 1620 12045 1620
+        6303 4526 7968 4526

 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5
 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5

-        12045 2520 10380 2520 10380 1170 12045 1170 12045 2520
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-        10600 1875 11051 1875
-4 0 0 50 0 18 12 0.0000 4 180 1095 10605 2070 count_spare\001
-4 0 0 50 0 18 12 0.0000 4 180 1065 10605 2295 count_order\001
-4 0 0 50 0 18 12 0.0000 4 135 465 10605 1845 ArtID\001
-4 1 0 50 0 18 16 0.0000 4 240 675 11190 1485 Spool\001
+        7968 5713 6323 5713 6323 4076 7968 4076 7968 5713
+4 0 0 50 0 18 12 0.0000 4 135 765 6528 4976 ArticleID\001
+4 0 0 50 0 18 12 0.0000 4 180 780 6528 4751 Dispatch\001
+4 1 0 50 0 18 16 0.0000 4 240 1380 7113 4391 Dispatchlist\001
+4 0 0 50 0 18 12 0.0000 4 180 780 6513 5231 Quantity\001
+4 0 0 50 0 18 12 0.0000 4 135 450 6513 5516 Price\001

 -6
 -6

-6 5655 5205 7410 6870
+6 6292 7440 7987 8955

 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2

-        5700 5700 7365 5700
+        6307 7905 7972 7905
+2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
+        6532 8150 7103 8149

 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5
 2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5

-        7365 6825 5700 6825 5700 5250 7365 5250 7365 6825
-4 0 0 50 0 18 12 0.0000 4 135 465 5925 6150 ArtID\001
-4 0 0 50 0 18 12 0.0000 4 135 675 5925 6375 Amount\001
-4 0 0 50 0 18 12 0.0000 4 135 705 5925 5925 OrderID\001
-4 0 0 50 0 18 12 0.0000 4 135 450 5925 6600 Price\001
-4 1 0 50 0 18 16 0.0000 4 180 1020 6510 5565 Orderlist\001
+        7972 8940 6322 8940 6322 7455 7972 7455 7972 8940
+4 0 0 50 0 18 12 0.0000 4 135 510 6532 8355 Name\001
+4 0 0 50 0 18 12 0.0000 4 180 1005 6532 8580 Description\001
+4 0 0 50 0 18 12 0.0000 4 135 570 6532 8130 Article\001
+4 0 0 50 0 18 12 0.0000 4 135 630 6532 8805 Picture\001
+4 1 0 50 0 18 16 0.0000 4 180 765 7117 7770 Article\001

 -6
 -6

-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 2337 1762 30 30 2337 1762 2367 1762
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 3774 3587 30 30 3774 3587 3804 3587
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 5149 3387 30 30 5149 3387 5179 3387
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 5849 5837 30 30 5849 5837 5879 5837
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 7224 6075 30 30 7224 6075 7254 6075
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 8012 3412 30 30 8012 3412 8042 3412
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 9423 3387 30 30 9423 3387 9453 3387
-1 3 0 1 0 0 50 0 20 0.000 1 0.0000 10486 1800 30 30 10486 1800 10516 1800
+6 10421 4965 12135 7425
+2 1 0 2 0 7 50 0 -1 0.000 0 0 -1 0 0 2
+        10455 5430 12120 5430

 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2

+        10670 5687 11425 5687
+2 4 0 2 0 7 50 0 -1 0.000 0 0 7 0 0 5
+        12120 7410 10436 7410 10436 4980 12120 4980 12120 7410
+4 0 0 50 0 18 12 0.0000 4 135 570 10680 5880 Article\001
+4 0 0 50 0 18 12 0.0000 4 135 510 10680 6105 Name\001
+4 0 0 50 0 18 12 0.0000 4 135 765 10680 5655 ArticleID\001
+4 1 0 50 0 18 16 0.0000 4 180 615 11265 5295 Offer\001
+4 0 0 50 0 18 12 0.0000 4 135 630 10695 6330 HxWxD\001
+4 0 0 50 0 18 12 0.0000 4 135 450 10695 6555 Price\001
+4 0 0 50 0 18 12 0.0000 4 180 885 10695 6780 Price_orig\001
+4 0 0 50 0 18 12 0.0000 4 135 585 10695 7020 Pieces\001
+4 0 0 50 0 18 12 0.0000 4 135 330 10695 7260 Tax\001
+-6
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 2337 1762 30 30 2337 1762 2367 1762
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 3774 3587 30 30 3774 3587 3804 3587
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 5149 3387 30 30 5149 3387 5179 3387
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 13863 4473 30 30 13863 4473 13893 4473
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 10545 5603 30 30 10545 5603 10575 5603
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 10545 5820 30 30 10545 5820 10575 5820
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 12009 5626 30 30 12009 5626 12039 5626
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 7797 8098 30 30 7797 8098 7827 8098
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 7811 4902 30 30 7811 4902 7841 4902
+1 3 0 1 0 0 51 0 20 0.000 1 0.0000 6410 4692 30 30 6410 4692 6440 4692
+2 1 0 1 0 7 51 0 -1 0.000 0 0 -1 0 0 2

         2352 1755 3762 3585
         2352 1755 3762 3585

-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-        5157 3375 5847 5880
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-        8007 3375 7242 6090
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 2
-        9447 3360 10482 1770
+2 1 0 1 0 7 51 0 -1 0.000 0 0 -1 0 0 2
+        5157 3375 6405 4699
+2 1 0 1 0 7 51 0 -1 0.000 0 0 -1 0 0 2
+        7802 4923 10538 5610
+2 1 0 1 0 7 51 0 -1 0.000 0 0 -1 0 0 2
+        7794 8096 10538 5828
+2 1 0 1 0 7 51 0 -1 0.000 0 0 -1 0 0 2
+        13859 4490 12009 5633

diff --git a/misc/schemes b/misc/schemes
new file mode 100644 (file)
index 0000000..ea0215e
--- /dev/null
+++ b/misc/schemes
@@ -0,0 +1,98 @@
+DROP TABLE article;
+DROP TABLE offer;
+DROP TABLE spool;
+DROP TABLE customer;
+DROP TABLE dispatch;
+DROP TABLE dispatchlist;
+
+CREATE TABLE article (
+       article VARCHAR(10),
+       name TEXT,
+       description TEXT,
+       url_path TEXT,
+       url_width INT4,
+       url_height INT4,
+       comment TEXT,
+       tax float4
+);
+CREATE UNIQUE INDEX "article_id" on "article" using btree ( article );
+CREATE  INDEX "article_name" on "article" using btree ( name );
+
+CREATE TABLE offer (
+       articleid VARCHAR(12),
+       article VARCHAR(10),
+       name TEXT,
+       self_width  FLOAT4,
+       self_height FLOAT4,
+       self_depth  FLOAT4,
+       self_weight FLOAT4,
+       comment TEXT,
+       price float4,
+       price_orig float4
+);
+CREATE UNIQUE INDEX "offer_id" on "offer" using btree ( articleid );
+CREATE  INDEX "offer_offer" on "offer" using btree ( article );
+CREATE  INDEX "offer_name" on "offer" using btree ( name );
+
+CREATE TABLE spool (
+       articleid VARCHAR(12),
+       count_spare int4,
+       count_sold int4
+);
+CREATE INDEX "spool_id" on "spool" using btree ( articleid );
+
+CREATE TABLE customer (
+       customer int4,
+       company TEXT,
+       firstname TEXT,
+       lastname TEXT,
+       appendix TEXT,
+       street TEXT,
+       plz TEXT,
+       city TEXT,
+       country TEXT,
+       comment TEXT,
+       passwd TEXT
+);
+CREATE UNIQUE INDEX "customer_id" on "customer" using btree ( customer );
+
+CREATE TABLE dispatch (
+       dispatch int4,
+       customer int4,
+       date datetime,
+       status int4
+);
+CREATE UNIQUE INDEX "dispatch_id" on "dispatch" using btree ( dispatch );
+
+CREATE TABLE dispatchlist (
+       dispatch int4,
+       articleid varchar(12),
+       quantity int4,
+       unitprice float4
+);
+CREATE  INDEX "dispatchlist_orderid" on "dispatchlist" using btree ( dispatch );
+CREATE  INDEX "dispatchlist_artid"   on "dispatchlist" using btree ( articleid );
+
+REVOKE ALL on "article" from PUBLIC;
+GRANT  ALL on "article" to "www";
+GRANT  ALL on "article" to "joey";
+
+REVOKE ALL on "offer" from PUBLIC;
+GRANT  ALL on "offer" to "www";
+GRANT  ALL on "offer" to "joey";
+
+REVOKE ALL on "dispatch" from PUBLIC;
+GRANT  ALL on "dispatch" to "www";
+GRANT  ALL on "dispatch" to "joey";
+
+REVOKE ALL on "dispatchlist" from PUBLIC;
+GRANT  ALL on "dispatchlist" to "www";
+GRANT  ALL on "dispatchlist" to "joey";
+
+REVOKE ALL on "customer" from PUBLIC;
+GRANT  ALL on "customer" to "www";
+GRANT  ALL on "customer" to "joey";
+
+REVOKE ALL on "spool" from PUBLIC;
+GRANT  ALL on "spool" to "www";
+GRANT  ALL on "spool" to "joey";

diff --git a/misc/schemes.semantic b/misc/schemes.semantic
new file mode 100644 (file)
index 0000000..0bb15a0
--- /dev/null
+++ b/misc/schemes.semantic
@@ -0,0 +1,44 @@
+order.status
+0=ordered, 1=processed, 2=sent, 3=paid, 4=cancelled
+
+1    -  01 - 001   -  01   -   01
+Type - Typ - Motiv - Farbe - Groesse
+
+1 Stoff
+2 Porzellan
+3 Metall
+4 Holz
+5 Papier
+...
+
+<stoff>
+01 T-Shirt
+02 Pullover
+</stoff>
+
+<plastik>
+01 Kugelschreiber
+</plastik>
+
+<metall>
+01 Pin
+</metall>
+
+001 - T-Shirt "Debian Kringel"
+002 - T-Shirt "Debian Flasche"
+
+2001 - Kugelschreiber "Debian"
+
+01 rot
+02 gruen
+03 blau
+04 schwarz
+
+00 -keine groesse-
+01 XS
+02 S
+03 M
+04 L
+05 XL
+06 XXL
+07 XXXL

diff --git a/src/impressum.wml b/src/impressum.wml
new file mode 100644 (file)
index 0000000..f9a0c26
--- /dev/null
+++ b/src/impressum.wml
@@ -0,0 +1,20 @@
+#include <infocon.style>
+
+<page name=Impressum>
+
+<p>Die Verantwortlichkeit für die unter "http://infocon.infodrom.org/"
+abgelegten Seiten trägt für die Firma InfoCon, Herr Martin
+Schulze, Am Zollbaum 7, 26129 Oldenburg, E-Mail: <a
+href="mailto:schulze@infocon.infodrom.org">schulze (at) infocon (dot) infodrom
+(dot) org</A>.
+
+# <p>Die Seiten werden vom Webmaster-Team Christian Weerts und Martin
+# Schulze gewartet.  E-Mail: <a href="<mailto webmaster>"><mailto webmaster></a>
+
+</page>
+
+# Local variables:
+# mode: html
+# mode: auto-fill
+# mode: iso-accents
+# end:

diff --git a/src/index.wml b/src/index.wml
index bf5c1b7..5a125e2 100644 (file)
--- a/src/index.wml
+++ b/src/index.wml
@@ -6,13 +6,17 @@
 
 <blockquote>
 
 
 <blockquote>
 

-  Willkommen auf den Seiten von InfoCon in Oldenburg.  Auf den folgenden Seiten
-  finden Sie unsere Dienstleistungen sowie viele Informationen und
-  Begründungen, wieso wir einige Systeme bevorzugen.<p>
+  Willkommen auf den Web-Seiten der Firma InfoCon in Oldenburg.  Auf
+  den folgenden Seiten finden Sie unsere Dienstleistungen sowie viele
+  Informationen und Begründungen, wieso wir einige Systeme
+  bevorzugen.<p>

 
   Besuchen Sie auch unseren Shop, in dem Sie seltene Artikel rund um
   Freie Software und Linux zu günstigen Preisen finden.
 
 
   Besuchen Sie auch unseren Shop, in dem Sie seltene Artikel rund um
   Freie Software und Linux zu günstigen Preisen finden.
 

+<div align=right>
+<a href="http://www.linux.de/"><img src="<root_prefix>Pics/powered_by_linux.gif" alt="Powered by Linux" border=0 width=180 height=70></a>
+</div>

 </blockquote>
 
 </page>
 </blockquote>
 
 </page>