SuperX
/
sxc
7
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity
Browse Source

Hochschulnamen in Sichten ergänzt #4

sxc_0.1_Release
Daniel Quathamer 8 months ago
parent
4764ffce93
commit
fef1a1de90
3 changed files with 95 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      src-modules/module/sxc/conf/sxc.xml
  2. 46
      src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql
  3. 4
      src-modules/module/sxc/upgrade/sxc_upgrade_man.sql

85
src-modules/module/sxc/conf/sxc.xml
Unescape View File

@ -540,18 +540,21 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" /> @@ -540,18 +540,21 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" />
<column name="apnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="parent" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::bpchar AS druck, 'Hochschulen'::bpchar AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hsk_hochschultypen.bezeichnung AS druck, sxc_hsk_hochschultypen.bezeichnung AS kurztext,
sxc_hsk_hochschultypen.laufnummer::character(10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Hochschultyp'::varchar(255) as struktur_str
FROM sxc_hsk_hochschultypen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
@ -559,7 +562,8 @@ UNION @@ -559,7 +562,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_hochschultypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_art)))::character(10) AS parent,
2::smallint AS ebene
2::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL;
]]></sql>
@ -570,24 +574,28 @@ UNION @@ -570,24 +574,28 @@ UNION
<column name="apnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="parent" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::character varying AS druck, 'Hochschulen'::character varying AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hochschulen.hsk_bundesland AS druck, sxc_hochschulen.hsk_bundesland AS kurztext,
SELECT distinct sxc_hochschulen.hsk_bundesland AS druck, sxc_hochschulen.hsk_bundesland AS kurztext,
"substring"(sxc_hochschulen.hsk_bundesland::text, 1, 10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Bundesland'::varchar(255) as struktur_str
FROM sxc_hochschulen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
sxc_hochschulen.hs_nr AS apnr,
"substring"(sxc_hochschulen.hsk_bundesland::text, 1, 10) AS parent,
2::smallint AS ebene
2::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL;
]]></sql>
@ -598,22 +606,26 @@ UNION @@ -598,22 +606,26 @@ UNION
<column name="apnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="parent" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::character varying AS druck, 'Hochschulen'::character varying AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
sxc_hochschulen.hs_nr AS apnr,
'0'::character(10) AS parent,
1::smallint AS ebene
1::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL;
]]></sql>
</view>
<!--
<view name="sxc_hochschulen_nrw_art">
<columns><column name="druck" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="kurztext" type ="VARCHAR" size ="255" default ="" notnull ="false" />
@ -625,13 +637,15 @@ UNION @@ -625,13 +637,15 @@ UNION
SELECT 'Hochschulen in NRW'::bpchar AS druck, 'Hochschulen in NRW'::bpchar AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hsk_hochschultypen.bezeichnung AS druck, sxc_hsk_hochschultypen.bezeichnung AS kurztext,
sxc_hsk_hochschultypen.laufnummer::character(10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Hochschultyp'::varchar(255) as struktur_str
FROM sxc_hsk_hochschultypen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
@ -639,7 +653,8 @@ UNION @@ -639,7 +653,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_hochschultypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_art)))::character(10) AS parent,
2::smallint AS ebene
2::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL AND sxc_hochschulen.hsk_bundesland::text = 'Nordrhein-Westfalen'::text;
]]></sql>
@ -665,7 +680,7 @@ UNION @@ -665,7 +680,7 @@ UNION
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL AND sxc_hochschulen.hsk_bundesland::text = 'Nordrhein-Westfalen'::text;
]]></sql>
</view>
</view>-->
<view name="sxc_hochschulen_hsk_art">
<columns><column name="druck" type ="VARCHAR" size ="255" default ="" notnull ="false" />
@ -673,18 +688,21 @@ UNION @@ -673,18 +688,21 @@ UNION
<column name="apnr" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="parent" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::bpchar AS druck, 'Hochschulen'::bpchar AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hsk_hochschultypen.bezeichnung AS druck, sxc_hsk_hochschultypen.bezeichnung AS kurztext,
sxc_hsk_hochschultypen.laufnummer::character(10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Hochschultyp'::varchar(255) as struktur_str
FROM sxc_hsk_hochschultypen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
@ -692,7 +710,8 @@ UNION @@ -692,7 +710,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_hochschultypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_art)))::character(10) AS parent,
2::smallint AS ebene
2::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL AND NOT (sxc_hochschulen.hsk_laufnummer IN ( SELECT sxc_hochschulen_standorte.hsk_laufnummer
FROM sxc_hochschulen_standorte
@ -703,7 +722,8 @@ UNION @@ -703,7 +722,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_hochschultypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_art)))::character(10) AS parent,
2::smallint AS ebene
2::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL AND (sxc_hochschulen.hsk_laufnummer IN ( SELECT sxc_hochschulen_standorte.hsk_laufnummer
FROM sxc_hochschulen_standorte
@ -713,7 +733,8 @@ UNION @@ -713,7 +733,8 @@ UNION
(btrim(sxc_hochschulen_standorte.kurzname::text) || ' Standort '::text) || sxc_hochschulen_standorte.standort_ort::text AS kurztext,
sxc_hochschulen_standorte.standort_nr AS apnr,
'ST_'::text || sxc_hochschulen_standorte.hs_nr::text AS parent,
3::smallint AS ebene
3::smallint AS ebene,
'Standort'::varchar(255) as struktur_str
FROM sxc_hochschulen_standorte
WHERE sxc_hochschulen_standorte.hs_nr IS NOT NULL AND sxc_hochschulen_standorte.standort_nr IS NOT NULL;
]]></sql>
@ -724,18 +745,21 @@ UNION @@ -724,18 +745,21 @@ UNION
<column name="apnr" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="parent" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::bpchar AS druck, 'Hochschulen'::bpchar AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hsk_traegerschaftstypen.bezeichnung AS druck, sxc_hsk_traegerschaftstypen.bezeichnung AS kurztext,
sxc_hsk_traegerschaftstypen.laufnummer::character(10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Trägerschaft'::varchar(255) as struktur_str
FROM sxc_hsk_traegerschaftstypen
UNION
SELECT sxc_hochschulen.hsk_bundesland AS druck, sxc_hochschulen.hsk_bundesland AS kurztext,
@ -745,7 +769,8 @@ UNION @@ -745,7 +769,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_traegerschaftstypen h
WHERE h.bezeichnung::bpchar = sxc_hochschulen.hsk_traegerschaft)))::character(10) AS parent,
2 AS ebene
2 AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
@ -753,7 +778,8 @@ UNION @@ -753,7 +778,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_traegerschaftstypen h
WHERE h.bezeichnung::bpchar = sxc_hochschulen.hsk_traegerschaft)))::character(1)::text || "substring"(sxc_hochschulen.hsk_bundesland::text, 1, 9) AS parent,
3::smallint AS ebene
3::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen
WHERE sxc_hochschulen.hs_nr IS NOT NULL;
]]></sql>
@ -764,25 +790,29 @@ UNION @@ -764,25 +790,29 @@ UNION
<column name="apnr" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="parent" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="ebene" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="struktur_str" type ="VARCHAR" size ="255" default ="" notnull ="false" />
</columns>
<sql dbsystem=""><![CDATA[
SELECT 'Hochschulen'::bpchar AS druck, 'Hochschulen'::bpchar AS kurztext,
0::character(10) AS apnr,
NULL::character(10) AS parent,
0::smallint AS ebene
0::smallint AS ebene,
'Alle'::varchar(255) as struktur_str
FROM xdummy
UNION
SELECT sxc_hochschulen.hsk_bundesland AS druck, sxc_hochschulen.hsk_bundesland AS kurztext,
substring(sxc_hochschulen.hsk_bundesland::text, 1, 10) AS apnr,
'0'::character(10) AS parent,
1 AS ebene
1 AS ebene,
'Bundesland'::varchar(255) as struktur_str
FROM sxc_hochschulen
union
SELECT sxc_hochschulen.hsk_traegerschaft as druck, sxc_hochschulen.hsk_traegerschaft as kurztext,
SELECT distinct sxc_hochschulen.hsk_traegerschaft as druck, sxc_hochschulen.hsk_traegerschaft as kurztext,
((( SELECT h.laufnummer FROM sxc_hsk_traegerschaftstypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_traegerschaft)))::character(1) ||substring(sxc_hochschulen.hsk_bundesland::text, 1, 9) as apnr,
substring(sxc_hochschulen.hsk_bundesland::text, 1, 10) AS parent,
2 AS ebene
2 AS ebene,
'Trägerschaft'::varchar(255) as struktur_str
FROM sxc_hochschulen
UNION
SELECT sxc_hochschulen.name AS druck, sxc_hochschulen.kurztext as kurztext,
@ -790,7 +820,8 @@ UNION @@ -790,7 +820,8 @@ UNION
((( SELECT h.laufnummer
FROM sxc_hsk_traegerschaftstypen h
WHERE h.bezeichnung = sxc_hochschulen.hsk_traegerschaft)))::character(1)||substring(sxc_hochschulen.hsk_bundesland::text, 1, 9) AS parent,
3::smallint AS ebene
3::smallint AS ebene,
'Hochschule'::varchar(255) as struktur_str
FROM sxc_hochschulen where hs_nr is not null;
]]></sql>
</view>

46
src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql
Unescape View File

@ -7,27 +7,40 @@ select setval('sichten_tid_seq',(select max(tid) from sichten)); @@ -7,27 +7,40 @@ select setval('sichten_tid_seq',(select max(tid) from sichten));
{"name_intern":"sxc_hochschulen_nrw_art",
"name":"NRW-Hochschulen nach Art",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_nrw_art order by 1",
"art":"SXC-Kostenstellen-Sicht",
"sortnr":"10"},
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,apnr, parent, ebene from sxc_hochschulen_art
where struktur_str != ''Hochschule''
or apnr in (select hs_nr from sxc_hochschulen HB where HB.hsk_bundesland::text = ''Nordrhein-Westfalen''::text) order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"1000"},
{"name_intern":"sxc_hochschulen_nrw_liste",
"name":"NRW-Hochschulen Liste",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_nrw_liste order by 1",
"art":"SXC-Kostenstellen-Sicht",
"sortnr":"20"},
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_nrw_liste
where struktur_str != ''Hochschule''
or apnr in (select hs_nr from sxc_hochschulen HB where HB.hsk_bundesland::text = ''Nordrhein-Westfalen''::text) order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"1020"},
{"name_intern":"sxc_hochschulen_bland",
"name":"Hochschulen nach Bundesland",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_bland order by 1",
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_bland order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"30"},
{"name_intern":"sxc_hochschulen_art",
"name":"Hochschulen nach Art",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_hsk_art order by 1",
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_hsk_art order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"40"},
{"name_intern":"sxc_hochschulen_liste",
"name":"Hochschulen Liste",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_liste order by 1",
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_liste order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"50"},
{"name_intern":"sxc_hochschulen_liste_stammdaten",
@ -37,12 +50,16 @@ select setval('sichten_tid_seq',(select max(tid) from sichten)); @@ -37,12 +50,16 @@ select setval('sichten_tid_seq',(select max(tid) from sichten));
"sortnr":"60"},
{"name_intern":"sxc_hochschulen_traeger_bland",
"name":"Hochschulen nach Träger, Bundesland",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_traeger_bland order by 1",
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_traeger_bland order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"70"},
{"name_intern":"sxc_hochschulen_bland_traeger",
"name":"Hochschulen nach Bundesland, Träger",
"quelle":"<<SQL>> select kurztext ,apnr, parent, ebene from sxc_hochschulen_bland_traeger order by 1",
"quelle":"<<SQL>> select (case when struktur_str=''Hochschule''
then trim(kurztext) || '' - '' || trim(druck) else kurztext end) as name ,
apnr, parent, ebene from sxc_hochschulen_bland_traeger order by 1",
"art":"SXC_Hochschulen-Sicht",
"sortnr":"80"}
@ -60,7 +77,7 @@ CREATE temp TABLE tmp_sichten ( @@ -60,7 +77,7 @@ CREATE temp TABLE tmp_sichten (
name character(200),
beschreibung character(255),
sortnr integer DEFAULT 0 NOT NULL,
quelle character(255),
quelle text,
alt_hier_id character(150),
treecfgtable character(255),
treecfgid character(150),
@ -123,7 +140,10 @@ update sichten set art=(select T.art from tmp_sichten T @@ -123,7 +140,10 @@ update sichten set art=(select T.art from tmp_sichten T
where T.name_intern=sichten.name_intern)
where name_intern in (select T2.name_intern from tmp_sichten T2)
;
update sichten set name=(select T.name from tmp_sichten T
where T.name_intern=sichten.name_intern)
where name_intern in (select T2.name_intern from tmp_sichten T2)
;
update sichten set standbutton=(select T.standbutton from tmp_sichten T
where T.name_intern=sichten.name_intern)
where name_intern in (select T2.name_intern from tmp_sichten T2)

4
src-modules/module/sxc/upgrade/sxc_upgrade_man.sql
Unescape View File

@ -1 +1,5 @@ @@ -1 +1,5 @@
delete from xcube_dims where id in ('auspraegung_code_2','auspraegung_code_3');
update sichten set sortnr=sortnr*1000+sortnr
where systeminfoid=360
and name_intern like '%nrw%';

Write Preview
Loading…
Cancel
Save