Kategorie podniků budou lokalizované.
authorFrantišek Kučera <franta-hg@frantovo.cz>
Tue, 11 Jan 2011 15:27:51 +0100
changeset 1635f0d5e1305b3
parent 162 7ea45e9b10cb
child 164 e146e2e3b80b
Kategorie podniků budou lokalizované.
java/nekurak.net-ejb/src/conf/Kategorie.hbm.xml
java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kategorie.java
java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
java/nekurak.net-web/web/WEB-INF/tags/nekurak/podnikZahlavi.tag
java/nekurak.net-ws/nbproject/build-impl.xml
java/nekurak.net-ws/nbproject/genfiles.properties
java/nekurak.net-ws/nbproject/jax-ws.xml
java/nekurak.net-ws/nbproject/jaxws-build.xml
java/nekurak.net-ws/nbproject/project.xml
sql/data.sql
sql/schéma.sql
     1.1 --- a/java/nekurak.net-ejb/src/conf/Kategorie.hbm.xml	Mon Jan 10 17:27:53 2011 +0100
     1.2 +++ b/java/nekurak.net-ejb/src/conf/Kategorie.hbm.xml	Tue Jan 11 15:27:51 2011 +0100
     1.3 @@ -8,7 +8,5 @@
     1.4  				<param name="sequence">kategorie_seq</param>
     1.5  			</generator>
     1.6  		</id>
     1.7 -		<property name="nazev" column="nazev"/>
     1.8 -		<property name="popis" column="popis"/>
     1.9  	</class>
    1.10  </hibernate-mapping>
    1.11 \ No newline at end of file
     2.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kategorie.java	Mon Jan 10 17:27:53 2011 +0100
     2.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kategorie.java	Tue Jan 11 15:27:51 2011 +0100
     2.3 @@ -4,13 +4,14 @@
     2.4   * Kategorie, do které podnik patří.
     2.5   * Např. hospoda, bar, restaurace nebo cukrárna.
     2.6   * Podnik může patřit do více kategorií (měl by patřit alespoň do jedné).
     2.7 + *
     2.8 + * Entita obsahuje pouze ID a ne název a popis – ty musíme překládat – proto je načítáme z lokalizačních souborů.
     2.9 + *
    2.10   * @author fiki
    2.11   */
    2.12  public class Kategorie {
    2.13  
    2.14  	private int id;
    2.15 -	private String nazev;
    2.16 -	private String popis;
    2.17  
    2.18  	public int getId() {
    2.19  		return id;
    2.20 @@ -19,20 +20,4 @@
    2.21  	public void setId(int id) {
    2.22  		this.id = id;
    2.23  	}
    2.24 -
    2.25 -	public String getNazev() {
    2.26 -		return nazev;
    2.27 -	}
    2.28 -
    2.29 -	public void setNazev(String název) {
    2.30 -		this.nazev = název;
    2.31 -	}
    2.32 -
    2.33 -	public String getPopis() {
    2.34 -		return popis;
    2.35 -	}
    2.36 -
    2.37 -	public void setPopis(String popis) {
    2.38 -		this.popis = popis;
    2.39 -	}
    2.40  }
     3.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Mon Jan 10 17:27:53 2011 +0100
     3.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue Jan 11 15:27:51 2011 +0100
     3.3 @@ -56,6 +56,24 @@
     3.4  dto.podnik.cisloPopisne.tip=\u010d\u00edslo popisn\u00e9
     3.5  dto.podnik.mesto=M\u011bsto
     3.6  
     3.7 +# \u010d\u00edslo je ID kategorie v datab\u00e1zi
     3.8 +dto.kategorie.1.nazev=hospoda
     3.9 +dto.kategorie.1.popis=Maj\u00ed tu pivo a otev\u0159eno i p\u0159es den.
    3.10 +dto.kategorie.2.nazev=bar
    3.11 +dto.kategorie.2.popis=Maj\u00ed tu alepso\u0148 jeden bar a otev\u0159eno p\u0159ev\u00e1\u017en\u011b ve\u010der.
    3.12 +dto.kategorie.3.nazev=restaurace
    3.13 +dto.kategorie.3.popis=Tady si \u010dlov\u011bk m\u016f\u017ee d\u00e1t n\u011bco po\u0159\u00e1dn\u00e9ho k ob\u011bdu nebo k ve\u010de\u0159i (v\u00edc ne\u017e jen drobn\u00e9 pamlsky).
    3.14 +dto.kategorie.4.nazev=vin\u00e1rna
    3.15 +dto.kategorie.4.popis=Tady byl \u0161\u0165astn\u00fd Dion\u00fdsos.
    3.16 +dto.kategorie.5.nazev=kav\u00e1rna
    3.17 +dto.kategorie.5.popis=Posezen\u00ed u k\u00e1vy a z\u00e1kusku.
    3.18 +dto.kategorie.6.nazev=\u010dajovna
    3.19 +dto.kategorie.6.popis=M\u00edsto, kde si vychutn\u00e1te \u010daj a pov\u00edd\u00e1n\u00ed p\u0159\u00e1teli.
    3.20 +dto.kategorie.7.nazev=klub
    3.21 +dto.kategorie.7.popis=Diskot\u00e9ka, tan\u010d\u00edrna, hudebn\u00ed klub atd. Krom\u011b pit\u00ed tu m\u016f\u017eete i tancovat nebo si poslechnout koncert.
    3.22 +dto.kategorie.8.nazev=virtu\u00e1ln\u00ed
    3.23 +dto.kategorie.8.popis=Jak\u00e9si abstraktn\u00ed m\u00edsto nedosa\u017eiteln\u00e9 z b\u011b\u017en\u00e9ho fyzick\u00e9ho sv\u011bta.
    3.24 +
    3.25  registrace.nadpis=Registrace nov\u00e9ho u\u017eivatele
    3.26  registrace.kontrola=Zkontrolujte pros\u00edm zadan\u00e9 \u00fadaje.
    3.27  registrace.hotovo=\u00da\u010det byl \u00fasp\u011b\u0161n\u011b zalo\u017een, m\u016f\u017eete se
     4.1 --- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/podnikZahlavi.tag	Mon Jan 10 17:27:53 2011 +0100
     4.2 +++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/podnikZahlavi.tag	Tue Jan 11 15:27:51 2011 +0100
     4.3 @@ -40,8 +40,9 @@
     4.4  				<ul class="stitky">
     4.5  					<c:forEach var="k" items="${podnik.kategorie}">
     4.6  						<li>
     4.7 -							<a href="?akce=kategorie&amp;amp;id=${k.id}" title="${fn:escapeXml(k.popis)}">
     4.8 -								<c:out value="${k.nazev}"/>
     4.9 +							<fmt:message key="dto.kategorie.${k.id}.popis" var="popisKategorie"/>
    4.10 +							<a href="?akce=kategorie&amp;amp;id=${k.id}" title="${popisKategorie}">
    4.11 +								<fmt:message key="dto.kategorie.${k.id}.nazev"/>
    4.12  							</a>
    4.13  						</li>
    4.14  					</c:forEach>
     5.1 --- a/java/nekurak.net-ws/nbproject/build-impl.xml	Mon Jan 10 17:27:53 2011 +0100
     5.2 +++ b/java/nekurak.net-ws/nbproject/build-impl.xml	Tue Jan 11 15:27:51 2011 +0100
     5.3 @@ -18,7 +18,6 @@
     5.4  
     5.5          -->
     5.6  <project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="nekurak.net-ws-impl">
     5.7 -    <import file="jaxws-build.xml"/>
     5.8      <import file="ant-deploy.xml"/>
     5.9      <fail message="Please build using Ant 1.7.1 or higher.">
    5.10          <condition>
     6.1 --- a/java/nekurak.net-ws/nbproject/genfiles.properties	Mon Jan 10 17:27:53 2011 +0100
     6.2 +++ b/java/nekurak.net-ws/nbproject/genfiles.properties	Tue Jan 11 15:27:51 2011 +0100
     6.3 @@ -3,9 +3,9 @@
     6.4  build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
     6.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     6.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     6.7 -nbproject/build-impl.xml.data.CRC32=e6e63e07
     6.8 -nbproject/build-impl.xml.script.CRC32=9b10bf3f
     6.9 -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1
    6.10 +nbproject/build-impl.xml.data.CRC32=8b9ba573
    6.11 +nbproject/build-impl.xml.script.CRC32=14e75ae9
    6.12 +nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.3.1
    6.13  nbproject/wsit-deploy.xml.data.CRC32=4cb22909
    6.14  nbproject/wsit-deploy.xml.script.CRC32=deb039de
    6.15  nbproject/wsit-deploy.xml.stylesheet.CRC32=beb36995@3.9.1
     7.1 --- a/java/nekurak.net-ws/nbproject/jax-ws.xml	Mon Jan 10 17:27:53 2011 +0100
     7.2 +++ b/java/nekurak.net-ws/nbproject/jax-ws.xml	Tue Jan 11 15:27:51 2011 +0100
     7.3 @@ -1,12 +1,6 @@
     7.4  <?xml version="1.0" encoding="UTF-8"?>
     7.5  <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
     7.6    <services>
     7.7 -    <service name="Podnik">
     7.8 -      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
     7.9 -    </service>
    7.10 -    <service name="Pokus">
    7.11 -      <implementation-class>cz.frantovo.nekurak.ws.Pokus</implementation-class>
    7.12 -    </service>
    7.13    </services>
    7.14    <clients/>
    7.15  </jax-ws>
     8.1 --- a/java/nekurak.net-ws/nbproject/jaxws-build.xml	Mon Jan 10 17:27:53 2011 +0100
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,37 +0,0 @@
     8.4 -<?xml version="1.0" encoding="UTF-8"?>
     8.5 -<!--
     8.6 -        *** GENERATED FROM jax-ws.xml - DO NOT EDIT !                             ***
     8.7 -        *** TO MODIFY wsimport options USE Web Service node -> Edit WS Attributes ***
     8.8 -        *** TO CHANGE TARGETS GENERATED TO jaxws-build.xml COPY THOSE             ***
     8.9 -        *** TARGETS TO ../build.xml AND MODIFY THAT FILE INSTEAD                  ***
    8.10 -
    8.11 -        -->
    8.12 -<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
    8.13 -    <!--
    8.14 -                ===================
    8.15 -                JAX-WS WSGEN SECTION
    8.16 -                ===================
    8.17 -            -->
    8.18 -    <target name="wsgen-init" depends="init, -do-compile">
    8.19 -        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
    8.20 -        <mkdir dir="${build.classes.dir}"/>
    8.21 -        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
    8.22 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
    8.23 -        </taskdef>
    8.24 -    </target>
    8.25 -    <target name="wsgen-Podnik" depends="wsgen-init">
    8.26 -        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Podnik">
    8.27 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
    8.28 -        </wsgen>
    8.29 -    </target>
    8.30 -    <target name="wsgen-Pokus" depends="wsgen-init">
    8.31 -        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Pokus">
    8.32 -            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
    8.33 -        </wsgen>
    8.34 -    </target>
    8.35 -    <!--
    8.36 -                ===================
    8.37 -                JAX-WS WSIMPORT SECTION
    8.38 -                ===================
    8.39 -            -->
    8.40 -</project>
     9.1 --- a/java/nekurak.net-ws/nbproject/project.xml	Mon Jan 10 17:27:53 2011 +0100
     9.2 +++ b/java/nekurak.net-ws/nbproject/project.xml	Tue Jan 11 15:27:51 2011 +0100
     9.3 @@ -2,9 +2,7 @@
     9.4  <project xmlns="http://www.netbeans.org/ns/project/1">
     9.5      <type>org.netbeans.modules.web.project</type>
     9.6      <configuration>
     9.7 -        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
     9.8 -            <extension file="jaxws-build.xml" id="jaxws"/>
     9.9 -        </buildExtensions>
    9.10 +        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"/>
    9.11          <data xmlns="http://www.netbeans.org/ns/web-project/3">
    9.12              <name>nekurak.net-ws</name>
    9.13              <minimum-ant-version>1.6.5</minimum-ant-version>
    10.1 --- a/sql/data.sql	Mon Jan 10 17:27:53 2011 +0100
    10.2 +++ b/sql/data.sql	Tue Jan 11 15:27:51 2011 +0100
    10.3 @@ -1,9 +1,11 @@
    10.4  -- Kategorie podniků:
    10.5 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (1, 'hospoda', 'Mají tu pivo a otevřeno i přes den.');
    10.6 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (2, 'bar', 'Mají tu alepsoň jeden bar a otevřeno převážně večer.');
    10.7 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (3, 'restaurace', 'Tady si člověk může dát něco pořádného k obědu nebo k večeři (víc než jen drobné pamlsky).');
    10.8 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (4, 'vinárna', 'Tady byl šťastný Dionýsos.');
    10.9 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (5, 'kavárna', 'Posezení u kávy a zákusku.');
   10.10 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (6, 'čajovna', 'Místo, kde si vychutnáte čaj a povídání přáteli.');
   10.11 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (7, 'klub', 'Diskotéka, tančírna, hudební klub atd. Kromě pití tu můžete i tancovat nebo si poslechnout koncert.');
   10.12 -INSERT INTO nekurak.kategorie (id, nazev, popis) VALUES (8, 'virtuální', 'Jakési abstraktní místo nedosažitelné z běžného fyzického světa.');
   10.13 +-- Pozn.: zde uvedené názvy jsou jen jako pomůcka při přímé práci s databází,
   10.14 +-- aplikace zobrazuje lokalizované názvy a popisy načtené ze souboru.
   10.15 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (1, 'hospoda');
   10.16 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (2, 'bar');
   10.17 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (3, 'restaurace');
   10.18 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (4, 'vinárna');
   10.19 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (5, 'kavárna');
   10.20 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (6, 'čajovna');
   10.21 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (7, 'klub');
   10.22 +INSERT INTO nekurak.kategorie (id, nazev) VALUES (8, 'virtuální');
    11.1 --- a/sql/schéma.sql	Mon Jan 10 17:27:53 2011 +0100
    11.2 +++ b/sql/schéma.sql	Tue Jan 11 15:27:51 2011 +0100
    11.3 @@ -2,7 +2,7 @@
    11.4  -- PostgreSQL database dump
    11.5  --
    11.6  
    11.7 --- Started on 2011-01-08 19:54:48 CET
    11.8 +-- Started on 2011-01-11 15:26:21 CET
    11.9  
   11.10  SET statement_timeout = 0;
   11.11  SET client_encoding = 'UTF8';
   11.12 @@ -36,7 +36,7 @@
   11.13  ALTER DOMAIN nekurak.email OWNER TO nekurak;
   11.14  
   11.15  --
   11.16 --- TOC entry 1941 (class 0 OID 0)
   11.17 +-- TOC entry 1942 (class 0 OID 0)
   11.18  -- Dependencies: 366
   11.19  -- Name: DOMAIN email; Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.20  --
   11.21 @@ -64,7 +64,7 @@
   11.22  ALTER FUNCTION nekurak.bezny_uzivatel() OWNER TO nekurak;
   11.23  
   11.24  --
   11.25 --- TOC entry 1942 (class 0 OID 0)
   11.26 +-- TOC entry 1943 (class 0 OID 0)
   11.27  -- Dependencies: 65
   11.28  -- Name: FUNCTION bezny_uzivatel(); Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.29  --
   11.30 @@ -93,7 +93,7 @@
   11.31  
   11.32  --
   11.33  -- TOC entry 1609 (class 1259 OID 35205)
   11.34 --- Dependencies: 1896 10
   11.35 +-- Dependencies: 1897 10
   11.36  -- Name: clanek; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
   11.37  --
   11.38  
   11.39 @@ -107,7 +107,7 @@
   11.40  ALTER TABLE nekurak.clanek OWNER TO nekurak;
   11.41  
   11.42  --
   11.43 --- TOC entry 1944 (class 0 OID 0)
   11.44 +-- TOC entry 1945 (class 0 OID 0)
   11.45  -- Dependencies: 1609
   11.46  -- Name: TABLE clanek; Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.47  --
   11.48 @@ -133,7 +133,7 @@
   11.49  
   11.50  --
   11.51  -- TOC entry 1608 (class 1259 OID 35185)
   11.52 --- Dependencies: 1894 1895 10
   11.53 +-- Dependencies: 1895 1896 10
   11.54  -- Name: fotka; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
   11.55  --
   11.56  
   11.57 @@ -148,7 +148,7 @@
   11.58  ALTER TABLE nekurak.fotka OWNER TO nekurak;
   11.59  
   11.60  --
   11.61 --- TOC entry 1947 (class 0 OID 0)
   11.62 +-- TOC entry 1948 (class 0 OID 0)
   11.63  -- Dependencies: 1608
   11.64  -- Name: TABLE fotka; Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.65  --
   11.66 @@ -157,7 +157,7 @@
   11.67  
   11.68  
   11.69  --
   11.70 --- TOC entry 1948 (class 0 OID 0)
   11.71 +-- TOC entry 1949 (class 0 OID 0)
   11.72  -- Dependencies: 1608
   11.73  -- Name: COLUMN fotka.poradi; Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.74  --
   11.75 @@ -182,7 +182,7 @@
   11.76  
   11.77  --
   11.78  -- TOC entry 1613 (class 1259 OID 35278)
   11.79 --- Dependencies: 1897 1898 10
   11.80 +-- Dependencies: 1898 1899 10
   11.81  -- Name: hlasovani; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
   11.82  --
   11.83  
   11.84 @@ -198,7 +198,7 @@
   11.85  ALTER TABLE nekurak.hlasovani OWNER TO nekurak;
   11.86  
   11.87  --
   11.88 --- TOC entry 1951 (class 0 OID 0)
   11.89 +-- TOC entry 1952 (class 0 OID 0)
   11.90  -- Dependencies: 1613
   11.91  -- Name: COLUMN hlasovani.id; Type: COMMENT; Schema: nekurak; Owner: nekurak
   11.92  --
   11.93 @@ -209,7 +209,7 @@
   11.94  
   11.95  
   11.96  --
   11.97 --- TOC entry 1952 (class 0 OID 0)
   11.98 +-- TOC entry 1953 (class 0 OID 0)
   11.99  -- Dependencies: 1613
  11.100  -- Name: COLUMN hlasovani.hlas; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.101  --
  11.102 @@ -236,21 +236,20 @@
  11.103  
  11.104  --
  11.105  -- TOC entry 1617 (class 1259 OID 35398)
  11.106 --- Dependencies: 1901 10
  11.107 +-- Dependencies: 1902 10
  11.108  -- Name: kategorie; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.109  --
  11.110  
  11.111  CREATE TABLE kategorie (
  11.112      id integer DEFAULT nextval('kategorie_seq'::regclass) NOT NULL,
  11.113 -    nazev character varying(32) NOT NULL,
  11.114 -    popis character varying(255)
  11.115 +    nazev character varying(32) NOT NULL
  11.116  );
  11.117  
  11.118  
  11.119  ALTER TABLE nekurak.kategorie OWNER TO nekurak;
  11.120  
  11.121  --
  11.122 --- TOC entry 1955 (class 0 OID 0)
  11.123 +-- TOC entry 1956 (class 0 OID 0)
  11.124  -- Dependencies: 1617
  11.125  -- Name: TABLE kategorie; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.126  --
  11.127 @@ -259,6 +258,16 @@
  11.128  
  11.129  
  11.130  --
  11.131 +-- TOC entry 1957 (class 0 OID 0)
  11.132 +-- Dependencies: 1617
  11.133 +-- Name: COLUMN kategorie.nazev; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.134 +--
  11.135 +
  11.136 +COMMENT ON COLUMN kategorie.nazev IS 'jen pro info při přímé práci s SQL
  11.137 +aplikace bere názvy a popisy kategorií z lokalizačního souboru (na základě ID kategorie)';
  11.138 +
  11.139 +
  11.140 +--
  11.141  -- TOC entry 1614 (class 1259 OID 35333)
  11.142  -- Dependencies: 10
  11.143  -- Name: komentar_seq; Type: SEQUENCE; Schema: nekurak; Owner: nekurak
  11.144 @@ -275,7 +284,7 @@
  11.145  
  11.146  --
  11.147  -- TOC entry 1615 (class 1259 OID 35376)
  11.148 --- Dependencies: 1899 1900 10
  11.149 +-- Dependencies: 1900 1901 10
  11.150  -- Name: komentar; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.151  --
  11.152  
  11.153 @@ -292,7 +301,7 @@
  11.154  ALTER TABLE nekurak.komentar OWNER TO nekurak;
  11.155  
  11.156  --
  11.157 --- TOC entry 1958 (class 0 OID 0)
  11.158 +-- TOC entry 1960 (class 0 OID 0)
  11.159  -- Dependencies: 1615
  11.160  -- Name: TABLE komentar; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.161  --
  11.162 @@ -301,7 +310,7 @@
  11.163  
  11.164  
  11.165  --
  11.166 --- TOC entry 1959 (class 0 OID 0)
  11.167 +-- TOC entry 1961 (class 0 OID 0)
  11.168  -- Dependencies: 1615
  11.169  -- Name: COLUMN komentar.nadpis; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.170  --
  11.171 @@ -310,7 +319,7 @@
  11.172  
  11.173  
  11.174  --
  11.175 --- TOC entry 1960 (class 0 OID 0)
  11.176 +-- TOC entry 1962 (class 0 OID 0)
  11.177  -- Dependencies: 1615
  11.178  -- Name: COLUMN komentar.komentar; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.179  --
  11.180 @@ -336,7 +345,7 @@
  11.181  
  11.182  --
  11.183  -- TOC entry 1602 (class 1259 OID 35049)
  11.184 --- Dependencies: 1890 1891 10
  11.185 +-- Dependencies: 1890 1891 1892 10
  11.186  -- Name: podnik; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.187  --
  11.188  
  11.189 @@ -351,14 +360,16 @@
  11.190      mesto character varying(64),
  11.191      spravce character varying(64),
  11.192      sirka double precision,
  11.193 -    delka double precision
  11.194 +    delka double precision,
  11.195 +    stav character(1),
  11.196 +    CONSTRAINT stav_tg CHECK (((stav = ANY (ARRAY['k'::bpchar, 'n'::bpchar, 'o'::bpchar, 'c'::bpchar])) OR (stav IS NULL)))
  11.197  );
  11.198  
  11.199  
  11.200  ALTER TABLE nekurak.podnik OWNER TO nekurak;
  11.201  
  11.202  --
  11.203 --- TOC entry 1963 (class 0 OID 0)
  11.204 +-- TOC entry 1965 (class 0 OID 0)
  11.205  -- Dependencies: 1602
  11.206  -- Name: COLUMN podnik.spravce; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.207  --
  11.208 @@ -367,6 +378,19 @@
  11.209  
  11.210  
  11.211  --
  11.212 +-- TOC entry 1966 (class 0 OID 0)
  11.213 +-- Dependencies: 1602
  11.214 +-- Name: CONSTRAINT stav_tg ON podnik; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.215 +--
  11.216 +
  11.217 +COMMENT ON CONSTRAINT stav_tg ON podnik IS 'k = kuřácký
  11.218 +n = nekuřácký
  11.219 +o = oddělené části (důkladně)
  11.220 +c = částečně kuřácký (špatně oddělené, považujeme za kuřácký)
  11.221 +NULL = neznámý stav';
  11.222 +
  11.223 +
  11.224 +--
  11.225  -- TOC entry 1618 (class 1259 OID 35404)
  11.226  -- Dependencies: 10
  11.227  -- Name: podnik_kategorie; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.228 @@ -395,7 +419,7 @@
  11.229  ALTER TABLE nekurak.role OWNER TO nekurak;
  11.230  
  11.231  --
  11.232 --- TOC entry 1966 (class 0 OID 0)
  11.233 +-- TOC entry 1969 (class 0 OID 0)
  11.234  -- Dependencies: 1605
  11.235  -- Name: TABLE role; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.236  --
  11.237 @@ -420,7 +444,7 @@
  11.238  
  11.239  --
  11.240  -- TOC entry 1604 (class 1259 OID 35091)
  11.241 --- Dependencies: 1892 1893 10
  11.242 +-- Dependencies: 1893 1894 10
  11.243  -- Name: uzivatel; Type: TABLE; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.244  --
  11.245  
  11.246 @@ -438,7 +462,7 @@
  11.247  ALTER TABLE nekurak.uzivatel OWNER TO nekurak;
  11.248  
  11.249  --
  11.250 --- TOC entry 1969 (class 0 OID 0)
  11.251 +-- TOC entry 1972 (class 0 OID 0)
  11.252  -- Dependencies: 1604
  11.253  -- Name: COLUMN uzivatel.prezdivka; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.254  --
  11.255 @@ -461,7 +485,7 @@
  11.256  ALTER TABLE nekurak.uzivatel_role OWNER TO nekurak;
  11.257  
  11.258  --
  11.259 --- TOC entry 1971 (class 0 OID 0)
  11.260 +-- TOC entry 1974 (class 0 OID 0)
  11.261  -- Dependencies: 1606
  11.262  -- Name: TABLE uzivatel_role; Type: COMMENT; Schema: nekurak; Owner: nekurak
  11.263  --
  11.264 @@ -470,7 +494,7 @@
  11.265  
  11.266  
  11.267  --
  11.268 --- TOC entry 1917 (class 2606 OID 35227)
  11.269 +-- TOC entry 1918 (class 2606 OID 35227)
  11.270  -- Dependencies: 1609 1609
  11.271  -- Name: clanek_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.272  --
  11.273 @@ -480,7 +504,7 @@
  11.274  
  11.275  
  11.276  --
  11.277 --- TOC entry 1913 (class 2606 OID 35190)
  11.278 +-- TOC entry 1914 (class 2606 OID 35190)
  11.279  -- Dependencies: 1608 1608
  11.280  -- Name: fotka_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.281  --
  11.282 @@ -490,7 +514,7 @@
  11.283  
  11.284  
  11.285  --
  11.286 --- TOC entry 1915 (class 2606 OID 35204)
  11.287 +-- TOC entry 1916 (class 2606 OID 35204)
  11.288  -- Dependencies: 1608 1608 1608
  11.289  -- Name: fotka_poradi_uq; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.290  --
  11.291 @@ -500,7 +524,7 @@
  11.292  
  11.293  
  11.294  --
  11.295 --- TOC entry 1920 (class 2606 OID 35284)
  11.296 +-- TOC entry 1921 (class 2606 OID 35284)
  11.297  -- Dependencies: 1613 1613
  11.298  -- Name: hlasovani_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.299  --
  11.300 @@ -510,7 +534,7 @@
  11.301  
  11.302  
  11.303  --
  11.304 --- TOC entry 1925 (class 2606 OID 35403)
  11.305 +-- TOC entry 1926 (class 2606 OID 35403)
  11.306  -- Dependencies: 1617 1617
  11.307  -- Name: kategorie_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.308  --
  11.309 @@ -520,7 +544,7 @@
  11.310  
  11.311  
  11.312  --
  11.313 --- TOC entry 1923 (class 2606 OID 35385)
  11.314 +-- TOC entry 1924 (class 2606 OID 35385)
  11.315  -- Dependencies: 1615 1615
  11.316  -- Name: komentar_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.317  --
  11.318 @@ -530,7 +554,7 @@
  11.319  
  11.320  
  11.321  --
  11.322 --- TOC entry 1927 (class 2606 OID 35408)
  11.323 +-- TOC entry 1928 (class 2606 OID 35408)
  11.324  -- Dependencies: 1618 1618 1618
  11.325  -- Name: podnik_kategorie_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.326  --
  11.327 @@ -540,7 +564,7 @@
  11.328  
  11.329  
  11.330  --
  11.331 --- TOC entry 1903 (class 2606 OID 35058)
  11.332 +-- TOC entry 1904 (class 2606 OID 35058)
  11.333  -- Dependencies: 1602 1602
  11.334  -- Name: podnik_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.335  --
  11.336 @@ -550,7 +574,7 @@
  11.337  
  11.338  
  11.339  --
  11.340 --- TOC entry 1909 (class 2606 OID 35105)
  11.341 +-- TOC entry 1910 (class 2606 OID 35105)
  11.342  -- Dependencies: 1605 1605
  11.343  -- Name: skupina_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.344  --
  11.345 @@ -560,7 +584,7 @@
  11.346  
  11.347  
  11.348  --
  11.349 --- TOC entry 1905 (class 2606 OID 35098)
  11.350 +-- TOC entry 1906 (class 2606 OID 35098)
  11.351  -- Dependencies: 1604 1604
  11.352  -- Name: uzivatel_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.353  --
  11.354 @@ -570,7 +594,7 @@
  11.355  
  11.356  
  11.357  --
  11.358 --- TOC entry 1907 (class 2606 OID 35100)
  11.359 +-- TOC entry 1908 (class 2606 OID 35100)
  11.360  -- Dependencies: 1604 1604
  11.361  -- Name: uzivatel_prezdivka_uq; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.362  --
  11.363 @@ -580,7 +604,7 @@
  11.364  
  11.365  
  11.366  --
  11.367 --- TOC entry 1911 (class 2606 OID 35137)
  11.368 +-- TOC entry 1912 (class 2606 OID 35137)
  11.369  -- Dependencies: 1606 1606 1606
  11.370  -- Name: uzivatel_role_pk; Type: CONSTRAINT; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.371  --
  11.372 @@ -590,7 +614,7 @@
  11.373  
  11.374  
  11.375  --
  11.376 --- TOC entry 1918 (class 1259 OID 35291)
  11.377 +-- TOC entry 1919 (class 1259 OID 35291)
  11.378  -- Dependencies: 1613
  11.379  -- Name: hlasovani_ip_idx; Type: INDEX; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.380  --
  11.381 @@ -599,7 +623,7 @@
  11.382  
  11.383  
  11.384  --
  11.385 --- TOC entry 1921 (class 1259 OID 35309)
  11.386 +-- TOC entry 1922 (class 1259 OID 35309)
  11.387  -- Dependencies: 1613
  11.388  -- Name: hlsovani_datum_idx; Type: INDEX; Schema: nekurak; Owner: nekurak; Tablespace: 
  11.389  --
  11.390 @@ -608,7 +632,7 @@
  11.391  
  11.392  
  11.393  --
  11.394 --- TOC entry 1937 (class 2620 OID 35125)
  11.395 +-- TOC entry 1938 (class 2620 OID 35125)
  11.396  -- Dependencies: 1604 65
  11.397  -- Name: uzivatel_insert; Type: TRIGGER; Schema: nekurak; Owner: nekurak
  11.398  --
  11.399 @@ -620,8 +644,8 @@
  11.400  
  11.401  
  11.402  --
  11.403 --- TOC entry 1931 (class 2606 OID 35191)
  11.404 --- Dependencies: 1608 1602 1902
  11.405 +-- TOC entry 1932 (class 2606 OID 35191)
  11.406 +-- Dependencies: 1903 1608 1602
  11.407  -- Name: fotka_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.408  --
  11.409  
  11.410 @@ -630,8 +654,8 @@
  11.411  
  11.412  
  11.413  --
  11.414 --- TOC entry 1932 (class 2606 OID 35285)
  11.415 --- Dependencies: 1602 1902 1613
  11.416 +-- TOC entry 1933 (class 2606 OID 35285)
  11.417 +-- Dependencies: 1903 1602 1613
  11.418  -- Name: hlasovani_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.419  --
  11.420  
  11.421 @@ -640,8 +664,8 @@
  11.422  
  11.423  
  11.424  --
  11.425 --- TOC entry 1933 (class 2606 OID 35386)
  11.426 --- Dependencies: 1615 1602 1902
  11.427 +-- TOC entry 1934 (class 2606 OID 35386)
  11.428 +-- Dependencies: 1615 1602 1903
  11.429  -- Name: komentar_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.430  --
  11.431  
  11.432 @@ -650,8 +674,8 @@
  11.433  
  11.434  
  11.435  --
  11.436 --- TOC entry 1934 (class 2606 OID 35391)
  11.437 --- Dependencies: 1615 1906 1604
  11.438 +-- TOC entry 1935 (class 2606 OID 35391)
  11.439 +-- Dependencies: 1907 1604 1615
  11.440  -- Name: komentar_uzivatel_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.441  --
  11.442  
  11.443 @@ -660,8 +684,8 @@
  11.444  
  11.445  
  11.446  --
  11.447 --- TOC entry 1936 (class 2606 OID 35414)
  11.448 --- Dependencies: 1924 1618 1617
  11.449 +-- TOC entry 1937 (class 2606 OID 35414)
  11.450 +-- Dependencies: 1618 1925 1617
  11.451  -- Name: podnik_kategorie_kategorie_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.452  --
  11.453  
  11.454 @@ -670,8 +694,8 @@
  11.455  
  11.456  
  11.457  --
  11.458 --- TOC entry 1935 (class 2606 OID 35409)
  11.459 --- Dependencies: 1618 1902 1602
  11.460 +-- TOC entry 1936 (class 2606 OID 35409)
  11.461 +-- Dependencies: 1903 1602 1618
  11.462  -- Name: podnik_kategorie_podnik_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.463  --
  11.464  
  11.465 @@ -680,8 +704,8 @@
  11.466  
  11.467  
  11.468  --
  11.469 --- TOC entry 1928 (class 2606 OID 35178)
  11.470 --- Dependencies: 1602 1604 1906
  11.471 +-- TOC entry 1929 (class 2606 OID 35178)
  11.472 +-- Dependencies: 1602 1604 1907
  11.473  -- Name: podnik_uzivatel_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.474  --
  11.475  
  11.476 @@ -690,8 +714,8 @@
  11.477  
  11.478  
  11.479  --
  11.480 --- TOC entry 1929 (class 2606 OID 35138)
  11.481 --- Dependencies: 1605 1908 1606
  11.482 +-- TOC entry 1930 (class 2606 OID 35138)
  11.483 +-- Dependencies: 1909 1606 1605
  11.484  -- Name: uzivatel_role_role_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.485  --
  11.486  
  11.487 @@ -700,8 +724,8 @@
  11.488  
  11.489  
  11.490  --
  11.491 --- TOC entry 1930 (class 2606 OID 35143)
  11.492 --- Dependencies: 1604 1606 1906
  11.493 +-- TOC entry 1931 (class 2606 OID 35143)
  11.494 +-- Dependencies: 1907 1604 1606
  11.495  -- Name: uzivatel_role_uzivatel_fk; Type: FK CONSTRAINT; Schema: nekurak; Owner: nekurak
  11.496  --
  11.497  
  11.498 @@ -710,7 +734,7 @@
  11.499  
  11.500  
  11.501  --
  11.502 --- TOC entry 1940 (class 0 OID 0)
  11.503 +-- TOC entry 1941 (class 0 OID 0)
  11.504  -- Dependencies: 10
  11.505  -- Name: nekurak; Type: ACL; Schema: -; Owner: nekurak
  11.506  --
  11.507 @@ -722,7 +746,7 @@
  11.508  
  11.509  
  11.510  --
  11.511 --- TOC entry 1943 (class 0 OID 0)
  11.512 +-- TOC entry 1944 (class 0 OID 0)
  11.513  -- Dependencies: 1610
  11.514  -- Name: clanek_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.515  --
  11.516 @@ -734,7 +758,7 @@
  11.517  
  11.518  
  11.519  --
  11.520 --- TOC entry 1945 (class 0 OID 0)
  11.521 +-- TOC entry 1946 (class 0 OID 0)
  11.522  -- Dependencies: 1609
  11.523  -- Name: clanek; Type: ACL; Schema: nekurak; Owner: nekurak
  11.524  --
  11.525 @@ -746,7 +770,7 @@
  11.526  
  11.527  
  11.528  --
  11.529 --- TOC entry 1946 (class 0 OID 0)
  11.530 +-- TOC entry 1947 (class 0 OID 0)
  11.531  -- Dependencies: 1607
  11.532  -- Name: fotka_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.533  --
  11.534 @@ -758,7 +782,7 @@
  11.535  
  11.536  
  11.537  --
  11.538 --- TOC entry 1949 (class 0 OID 0)
  11.539 +-- TOC entry 1950 (class 0 OID 0)
  11.540  -- Dependencies: 1608
  11.541  -- Name: fotka; Type: ACL; Schema: nekurak; Owner: nekurak
  11.542  --
  11.543 @@ -770,7 +794,7 @@
  11.544  
  11.545  
  11.546  --
  11.547 --- TOC entry 1950 (class 0 OID 0)
  11.548 +-- TOC entry 1951 (class 0 OID 0)
  11.549  -- Dependencies: 1612
  11.550  -- Name: hlasovani_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.551  --
  11.552 @@ -782,7 +806,7 @@
  11.553  
  11.554  
  11.555  --
  11.556 --- TOC entry 1953 (class 0 OID 0)
  11.557 +-- TOC entry 1954 (class 0 OID 0)
  11.558  -- Dependencies: 1613
  11.559  -- Name: hlasovani; Type: ACL; Schema: nekurak; Owner: nekurak
  11.560  --
  11.561 @@ -794,7 +818,7 @@
  11.562  
  11.563  
  11.564  --
  11.565 --- TOC entry 1954 (class 0 OID 0)
  11.566 +-- TOC entry 1955 (class 0 OID 0)
  11.567  -- Dependencies: 1616
  11.568  -- Name: kategorie_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.569  --
  11.570 @@ -806,7 +830,7 @@
  11.571  
  11.572  
  11.573  --
  11.574 --- TOC entry 1956 (class 0 OID 0)
  11.575 +-- TOC entry 1958 (class 0 OID 0)
  11.576  -- Dependencies: 1617
  11.577  -- Name: kategorie; Type: ACL; Schema: nekurak; Owner: nekurak
  11.578  --
  11.579 @@ -818,7 +842,7 @@
  11.580  
  11.581  
  11.582  --
  11.583 --- TOC entry 1957 (class 0 OID 0)
  11.584 +-- TOC entry 1959 (class 0 OID 0)
  11.585  -- Dependencies: 1614
  11.586  -- Name: komentar_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.587  --
  11.588 @@ -830,7 +854,7 @@
  11.589  
  11.590  
  11.591  --
  11.592 --- TOC entry 1961 (class 0 OID 0)
  11.593 +-- TOC entry 1963 (class 0 OID 0)
  11.594  -- Dependencies: 1615
  11.595  -- Name: komentar; Type: ACL; Schema: nekurak; Owner: nekurak
  11.596  --
  11.597 @@ -842,7 +866,7 @@
  11.598  
  11.599  
  11.600  --
  11.601 --- TOC entry 1962 (class 0 OID 0)
  11.602 +-- TOC entry 1964 (class 0 OID 0)
  11.603  -- Dependencies: 1601
  11.604  -- Name: podnik_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.605  --
  11.606 @@ -854,7 +878,7 @@
  11.607  
  11.608  
  11.609  --
  11.610 --- TOC entry 1964 (class 0 OID 0)
  11.611 +-- TOC entry 1967 (class 0 OID 0)
  11.612  -- Dependencies: 1602
  11.613  -- Name: podnik; Type: ACL; Schema: nekurak; Owner: nekurak
  11.614  --
  11.615 @@ -866,7 +890,7 @@
  11.616  
  11.617  
  11.618  --
  11.619 --- TOC entry 1965 (class 0 OID 0)
  11.620 +-- TOC entry 1968 (class 0 OID 0)
  11.621  -- Dependencies: 1618
  11.622  -- Name: podnik_kategorie; Type: ACL; Schema: nekurak; Owner: nekurak
  11.623  --
  11.624 @@ -878,7 +902,7 @@
  11.625  
  11.626  
  11.627  --
  11.628 --- TOC entry 1967 (class 0 OID 0)
  11.629 +-- TOC entry 1970 (class 0 OID 0)
  11.630  -- Dependencies: 1605
  11.631  -- Name: role; Type: ACL; Schema: nekurak; Owner: nekurak
  11.632  --
  11.633 @@ -890,7 +914,7 @@
  11.634  
  11.635  
  11.636  --
  11.637 --- TOC entry 1968 (class 0 OID 0)
  11.638 +-- TOC entry 1971 (class 0 OID 0)
  11.639  -- Dependencies: 1603
  11.640  -- Name: uzivatel_seq; Type: ACL; Schema: nekurak; Owner: nekurak
  11.641  --
  11.642 @@ -902,7 +926,7 @@
  11.643  
  11.644  
  11.645  --
  11.646 --- TOC entry 1970 (class 0 OID 0)
  11.647 +-- TOC entry 1973 (class 0 OID 0)
  11.648  -- Dependencies: 1604
  11.649  -- Name: uzivatel; Type: ACL; Schema: nekurak; Owner: nekurak
  11.650  --
  11.651 @@ -914,7 +938,7 @@
  11.652  
  11.653  
  11.654  --
  11.655 --- TOC entry 1972 (class 0 OID 0)
  11.656 +-- TOC entry 1975 (class 0 OID 0)
  11.657  -- Dependencies: 1606
  11.658  -- Name: uzivatel_role; Type: ACL; Schema: nekurak; Owner: nekurak
  11.659  --
  11.660 @@ -925,7 +949,7 @@
  11.661  GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE uzivatel_role TO nekurak_web;
  11.662  
  11.663  
  11.664 --- Completed on 2011-01-08 19:54:50 CET
  11.665 +-- Completed on 2011-01-11 15:26:23 CET
  11.666  
  11.667  --
  11.668  -- PostgreSQL database dump complete