diff --git a/src-modules/module/sxc/conf/sxc.xml b/src-modules/module/sxc/conf/sxc.xml
index 3aeff32..95287c4 100644
--- a/src-modules/module/sxc/conf/sxc.xml
+++ b/src-modules/module/sxc/conf/sxc.xml
@@ -43,8 +43,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" />
+
-
@@ -224,6 +224,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" />
+
@@ -282,6 +283,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[SXC]" />
+
@@ -325,14 +327,9 @@ select 'Hochschulen', 0::char(10) as hs_nr, null::char(10) as parent, 0::smallin
union select bezeichnung, laufnummer::char(10), '0'::char(10) as parent, 1 as ebene from sxc_hsk_hochschultypen
--Element kann sich nicht selbst als parent haben!!
--die Einzelhochschulen
-union select name, hs_nr::char(10), (select laufnummer from sxc_hsk_hochschultypen H where H.bezeichnung=sxc_hochschulen.hsk_art)::char(10) as parent, 2::smallint as ebene from sxc_hochschulen where
-hs_nr is not null and hsk_laufnummer not in (select hsk_laufnummer from sxc_hochschulen_standorte where hauptsitz='1')
-union select name, 'ST_'||hs_nr::char(10), (select laufnummer from sxc_hsk_hochschultypen H where H.bezeichnung=sxc_hochschulen.hsk_art)::char(10) as parent, 2::smallint as ebene from sxc_hochschulen where
-hs_nr is not null and hsk_laufnummer in (select hsk_laufnummer from sxc_hochschulen_standorte where hauptsitz='1')
---und die Standorte
-union select trim(name)|| ' Standort '||standort_ort, hs_nr::char(10), 'ST_'||hs_nr_hauptsitz as parent, 3::smallint as ebene from sxc_hochschulen_standorte
-where hs_nr_hauptsitz is not null and hs_nr is not null;
-
+union select name, hs_nr::char(10), (select laufnummer from sxc_hsk_hochschultypen H where H.bezeichnung=sxc_hochschulen.hsk_art)::char(10) as parent,
+2::smallint as ebene from sxc_hochschulen where
+hs_nr is not null;
]]>
@@ -344,15 +341,8 @@ where hs_nr_hauptsitz is not null and hs_nr is not null;
@@ -365,13 +355,7 @@ where hs_nr_hauptsitz is not null and hs_nr is not null;
select 'Hochschulen', 0::char(10) as hs_nr, null::char(10) as parent, 0::smallint as ebene from xdummy
union
select name, hs_nr::char(10), '0'::char(10) as parent, 1::smallint as ebene from sxc_hochschulen where
-hs_nr is not null and hsk_laufnummer not in (select hsk_laufnummer from sxc_hochschulen_standorte where hauptsitz='1')
-union
-select name, 'ST_'||hs_nr::char(10), '0'::char(10) as parent, 1::smallint as ebene from sxc_hochschulen where
-hs_nr is not null and hsk_laufnummer in (select hsk_laufnummer from sxc_hochschulen_standorte where hauptsitz='1')
---und die Standorte
-union select trim(name)|| ' Standort '||standort_ort, hs_nr::char(10), 'ST_'||hs_nr_hauptsitz as parent, 1::smallint as ebene from sxc_hochschulen_standorte
-where hs_nr_hauptsitz is not null and hs_nr is not null;
+hs_nr is not null ;
]]>
@@ -383,44 +367,25 @@ where hs_nr_hauptsitz is not null and hs_nr is not null;
-
+
diff --git a/src-modules/module/sxc/etl/it.nrw/sfmk/insert.sql b/src-modules/module/sxc/etl/it.nrw/sfmk/insert.sql
index 7d84b5c..a0b0882 100644
--- a/src-modules/module/sxc/etl/it.nrw/sfmk/insert.sql
+++ b/src-modules/module/sxc/etl/it.nrw/sfmk/insert.sql
@@ -1,7 +1,7 @@
truncate table sxc_itnrw_sfmk;
insert into sxc_itnrw_sfmk(
-hs_nr,
+standort_nr,
hochschulstandort,
gueltig_ab_semester,
gueltig_bis_semester,
@@ -41,13 +41,17 @@ from sxc_itnrw_sfmk_neu
-- update sxc_itnrw_sfmk set hs_nr=substring(hs_nr from 2 for 10)
-- where hs_nr like '0%';
-
-update sxc_itnrw_sfmk set hs_nr=(select K.hs_nr_kenn
+
+update sxc_itnrw_sfmk set standort_nr=(select K.hs_nr_kenn
from sxc_trans_hs_nr K
-where K.hs_nr_sourcesystem=sxc_itnrw_sfmk.hs_nr)
+where K.hs_nr_sourcesystem=sxc_itnrw_sfmk.standort_nr)
where exists (select K.hs_nr_kenn
from sxc_trans_hs_nr K
-where K.hs_nr_sourcesystem=sxc_itnrw_sfmk.hs_nr);
+where K.hs_nr_sourcesystem=sxc_itnrw_sfmk.standort_nr);
+
+update sxc_itnrw_sfmk set hs_nr= standort_nr;
+update sxc_itnrw_sfmk set hs_nr= (select hs_nr from sxc_hochschulen_standorte where standort_nr= sxc_itnrw_sfmk.standort_nr)
+where standort_nr in (select standort_nr from sxc_hochschulen_standorte where hauptsitz is not null);
update sxc_itnrw_sfmk set gueltig_ab_semester=19001
where gueltig_ab_semester is null;
diff --git a/src-modules/module/sxc/masken/47090_felderinfo.unl b/src-modules/module/sxc/masken/47090_felderinfo.unl
index 783c6a4..7779edd 100644
--- a/src-modules/module/sxc/masken/47090_felderinfo.unl
+++ b/src-modules/module/sxc/masken/47090_felderinfo.unl
@@ -3,6 +3,6 @@
47092^Abschluss^40^0^0^100^200^5^char^30^0^1^<> select astat, dtxt from kenn_abschl_astat where struktur_c='Abschluss (amtlich)' order by 2;^^^
47093^Hochschulart^15^0^0^170^200^1^integer^30^0^1^<> select laufnummer,bezeichnung from sxc_hsk_hochschultypen order by 1^ ^ ^
47094^Stichwort^60^0^0^170^100^1^char^30^0^0^^^ ^
-47095^Standort^20^0^0^170^100^1^char^30^0^1^<> select hs_nr, trim(name) || ' Standort ' || standort_ort from sxc_hochschulen_standorte where 1=1 /* and hs_nr_hauptsitz in <@printkeys Hochschule.allNeededKeysList/> --<> */ order by 2;^^ ^
+47095^Standort^20^0^0^170^100^1^char^30^0^1^<> select standort_nr, trim(name) || ' Standort ' || standort_ort from sxc_hochschulen_standorte where 1=1 /* and hs_nr in <@printkeys Hochschule.allNeededKeysList/> --<> */ order by 2;^^ ^
47096^Trägerschaft^17^0^0^170^200^1^integer^30^0^1^<> select laufnummer,bezeichnung from sxc_hsk_traegerschaftstypen order by 1^ ^ ^
47097^Fächer^30^0^0^100^200^1^char^30^0^12^<> select tid,name,sortnr from sichten where art='KENN-Fächer-Sicht' order by sortnr,name;^^^
diff --git a/src-modules/module/sxc/masken/47090_maskeninfo.unl b/src-modules/module/sxc/masken/47090_maskeninfo.unl
index 13e775e..9ad9af6 100644
--- a/src-modules/module/sxc/masken/47090_maskeninfo.unl
+++ b/src-modules/module/sxc/masken/47090_maskeninfo.unl
@@ -45,7 +45,7 @@ where HSK.hsnr=H.hsk_laufnummer\
and HSK.traegerschaft= T.bezeichnung\
and T.laufnummer=<> ) */ \
\
-/* and hs_nr in (<>) */\
+/* and standort_nr in (<>) */\
group by 1,2,3,4,5,6\
order by 1,2,3,4,5,6\
;^XIL List\