diff --git a/src-modules/module/sxc/conf/sxc.xml b/src-modules/module/sxc/conf/sxc.xml
index 7eb2c5c..eaa66a6 100644
--- a/src-modules/module/sxc/conf/sxc.xml
+++ b/src-modules/module/sxc/conf/sxc.xml
@@ -540,18 +540,21 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" />
+
@@ -570,24 +574,28 @@ UNION
+
@@ -598,22 +606,26 @@ UNION
+
+
@@ -673,18 +688,21 @@ UNION
+
@@ -724,18 +745,21 @@ UNION
+
@@ -764,25 +790,29 @@ UNION
+
diff --git a/src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql b/src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql
index 5588988..d0fd4df 100644
--- a/src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql
+++ b/src-modules/module/sxc/schluesseltabellen/sichten_fuellen.sql
@@ -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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_nrw_art order by 1",
- "art":"SXC-Kostenstellen-Sicht",
- "sortnr":"10"},
+ "quelle":"<> 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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_nrw_liste order by 1",
- "art":"SXC-Kostenstellen-Sicht",
- "sortnr":"20"},
+ "quelle":"<> 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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_bland order by 1",
+ "quelle":"<> 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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_hsk_art order by 1",
+ "quelle":"<> 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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_liste order by 1",
+ "quelle":"<> 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));
"sortnr":"60"},
{"name_intern":"sxc_hochschulen_traeger_bland",
"name":"Hochschulen nach Träger, Bundesland",
- "quelle":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_traeger_bland order by 1",
+ "quelle":"<> 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":"<> select kurztext ,apnr, parent, ebene from sxc_hochschulen_bland_traeger order by 1",
+ "quelle":"<> 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 (
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
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)
diff --git a/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql b/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql
index 01533e6..ec009e2 100644
--- a/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql
+++ b/src-modules/module/sxc/upgrade/sxc_upgrade_man.sql
@@ -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%';