Compare commits

..

No commits in common. 'master' and 'etl_0.6_Release' have entirely different histories.

  1. 2
      src-modules/module/etl/conf/etl.xml
  2. 16
      src-modules/module/etl/masken/42000_felderinfo.unl
  3. 1
      src-modules/module/etl/masken/42000_masken_felder_bez.unl
  4. 22
      src-modules/module/etl/schluesseltabellen/create_load_etl_sx_captions.sql
  5. 28
      src-modules/module/etl/schluesseltabellen/create_load_etl_sxc_stud_zugang_abgang_aggr.sql
  6. 1
      src-modules/module/etl/schluesseltabellen/etl_manager_tab.unl
  7. 56
      src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql
  8. 6
      src-modules/module/etl/schluesseltabellen/fm_templates.unl
  9. 25
      src-modules/module/etl/schluesseltabellen/sx_captions_fuellen.sql
  10. 16
      src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql
  11. 42
      src-modules/module/etl/schluesseltabellen/trans_sxc_stud_zugang_abgang_aggr.sql
  12. 1
      superx/edit/etl/etl_manager.jsp

2
src-modules/module/etl/conf/etl.xml

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--<!DOCTYPE module SYSTEM "../../../conf/superx-module.dtd"> -->
<module name="etl" version="0.7b" sachgebiet_id="270"
<module name="etl" version="0.6" sachgebiet_id="270"
sachgebiet="Laderoutinen" systeminfo_id="270"
system="Laderoutinen" thema="Laderoutinen" thema_parent="Abfragen">
<database name="superx" system="superx">

16
src-modules/module/etl/masken/42000_felderinfo.unl

@ -38,19 +38,3 @@ select null::char(1),'Keine Auwahl möglich' from xdummy\ @@ -38,19 +38,3 @@ select null::char(1),'Keine Auwahl möglich' from xdummy\
\
/* <<just a comment to make it a modal dialog>> */^hidden^^
42009^Komponente^17^0^0^130^100^1^integer^30^0^1^<<SQL>> select tid,name from systeminfo order by 2^ ^ ^
42010^Hochschule^17^0^0^130^100^1^integer^30^0^1^<<SQL>> --freemarker template\
<sqlvars>\
<sqlvar name="SXC_installed">\
select 1 from xdummy where 0 &lt; (select count(*) from db_version where his_system='sxc')\
union select 0 from xdummy where \
0 = (select count(*) from db_version where his_system='sxc');\
</sqlvar>\
</sqlvars>\
\
<#if SXC_installed==1>\
select apnr,kurztext from sxc_hochschulen_liste order by 2;\
<#else>\
select null::char(1),'Keine Auwahl möglich' from xdummy\
</#if>\
\
/* <<just a comment to make it a modal dialog>> */^hidden^ ^

1
src-modules/module/etl/masken/42000_masken_felder_bez.unl

@ -8,4 +8,3 @@ @@ -8,4 +8,3 @@
42000^42007^
42000^42008^
42000^42009^
42000^42010^

22
src-modules/module/etl/schluesseltabellen/create_load_etl_sx_captions.sql

@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
--Freemarker Template
--used in etl-job sx_insert_mask
<#if SQLdialect='Postgres'>
drop table if exists tmp_etl_sx_captions;
</#if>
create table tmp_etl_sx_captions(
id CHAR(200) ,
table_name CHAR(200) ,
field_name CHAR(200) ,
record_no INTEGER ,
locale CHAR(10) ,
contents_short CHAR(255) ,
contents_long text ,
equalitystatus SMALLINT ,
sachgebiete_id INTEGER ,
doku_link VARCHAR(255) ,
export_to_glossar INTEGER
);

28
src-modules/module/etl/schluesseltabellen/create_load_etl_sxc_stud_zugang_abgang_aggr.sql

@ -1,28 +0,0 @@ @@ -1,28 +0,0 @@
--Freemarker Template
--used in etl-job qa_project_upload
<#if SQLdialect='Postgres'>
drop table if exists tmp_sxc_stud_zugang_abgang_aggr;
</#if>
CREATE TABLE tmp_sxc_stud_zugang_abgang_aggr (
hs_nr char(10) NOT NULL,
jahr integer NOT NULL,
anfangsbestand integer,
zugang integer,
zugang_ersteinschr integer,
abgang integer,
abgang_hauptpr integer,
abgang_ohne_hauptpr integer,
hauptpr_summe integer,
hauptpr_bleibt integer,
endbestand integer,
datenstand date
);

1
src-modules/module/etl/schluesseltabellen/etl_manager_tab.unl

@ -2,4 +2,3 @@ @@ -2,4 +2,3 @@
2^SICHT^Sichten^0^sichten_unload^sichten_upload^SICHTEN_TID^42000^42004^1^
3^QA_PROJECT^Testfälle^0^qa_project_unload^qa_project_upload^QA_PROJECT_ID^42000^42007^1^
4^RPTA_COLUMN_LAYOUT^Spaltenlayouts^0^rpta_column_layout_unload^rpta_column_layout_upload^RPTA_COLUMN_LAYOUT_TID^42000^42008^1^
5^SXC_STUD^SXC Studierendenströme^0^sxc_stud_zugang_abgang_aggr_unload^sxc_stud_zugang_abgang_aggr_upload^HS_NR^42000^42010^1^

56
src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql

@ -12,9 +12,7 @@ @@ -12,9 +12,7 @@
{"uniquename":"sos_gewichtung_unload", "name":"Gewichtungen entladen", "systeminfo_id":270 ,"logfile":""},
{"uniquename":"qa_project_unload", "name":"Testfallprojekte entladen", "systeminfo_id":260 ,"logfile":""},
{"uniquename":"rpta_column_layout_unload", "name":"Spaltenlayout entladen", "systeminfo_id":330 ,"logfile":""},
{"uniquename":"rpta_column_layout_upload", "name":"Spaltenlayout hochladen", "systeminfo_id":330 ,"logfile":""},
{"uniquename":"sxc_stud_zugang_abgang_aggr_unload", "name":"Studierendenströme für SXC entladen", "systeminfo_id":360 ,"logfile":""},
{"uniquename":"sxc_stud_zugang_abgang_aggr_upload", "name":"Studierendenströme für SXC hochladen", "systeminfo_id":360 ,"logfile":""}
{"uniquename":"rpta_column_layout_upload", "name":"Spaltenlayout hochladen", "systeminfo_id":330 ,"logfile":""}
] />
@ -53,16 +51,6 @@ @@ -53,16 +51,6 @@
{"etl_job":"rpta_column_layout_upload","param_name":"RPTA_COLUMN_LAYOUT_TID", "name":"ID", "param_default":""},
{"etl_job":"rpta_column_layout_upload","param_name":"PATH_TO_INPUTFILE", "name":"Eingabedatei", "param_default":""},
{"etl_job":"rpta_column_layout_upload","param_name":"FORMAT", "name":"Format", "param_default":"XML"},
{"etl_job":"sxc_stud_zugang_abgang_aggr_unload","param_name":"HS_NR", "name":"Hochschule", "param_default":""},
{"etl_job":"sxc_stud_zugang_abgang_aggr_unload","param_name":"PATH_TO_OUTPUTFILE", "name":"Ausgabedatei", "param_default":"$SUPERX_DIR/db/masken/rpta_column_layout_$RPTA_COLUMN_LAYOUT_UNIQUENAME.xml"},
{"etl_job":"sxc_stud_zugang_abgang_aggr_unload","param_name":"FORMAT", "name":"Ausgabeformat", "param_default":"XML"},
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload","param_name":"SYSTEMINFO_ID", "name":"Komponente", "param_default":""},
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload","param_name":"HS_NR", "name":"ID", "param_default":""},
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload","param_name":"PATH_TO_INPUTFILE", "name":"Eingabedatei", "param_default":""},
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload","param_name":"FORMAT", "name":"Format", "param_default":"XML"},
{"etl_job":"sos_gewichtung_unload","param_name":"SYSTEMINFO_ID", "name":"Komponente", "param_default":""},
{"etl_job":"sos_gewichtung_unload","param_name":"PATH_TO_OUTPUTFILE", "name":"Ausgabedatei", "param_default":"$SUPERX_DIR/db/db/module/sos/schluesseltabellen/sichten_$SYSTEMINFO_ID.xml"},
@ -81,7 +69,6 @@ @@ -81,7 +69,6 @@
{"etl_job":"sx_select_mask", "uniquename":"unload_sx_mask_style", "name":"sx_mask_style entladen", "type":"UNLOAD"},
{"etl_job":"sx_select_mask", "uniquename":"unload_sx_stylesheets", "name":"sx_stylesheets entladen", "type":"UNLOAD"},
{"etl_job":"sx_select_mask", "uniquename":"unload_stylesheet_field", "name":"stylesheet_field entladen", "type":"UNLOAD"},
{"etl_job":"sx_select_mask", "uniquename":"unload_captions", "name":"captions entladen", "type":"UNLOAD"},
{"etl_job":"sx_insert_mask", "uniquename":"create_tmp_etl_masken", "name":"Tabellen tmp_etl_masken erzeugen", "type":"DOSQL" },
@ -96,18 +83,15 @@ @@ -96,18 +83,15 @@
{"etl_job":"sx_insert_mask", "uniquename":"upload_maske_system_bez", "name":"maske_system_bez hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"create_tmp_etl_themenbaum", "name":"Tabelle tmp_etl_themenbaum erzeugen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"create_tmp_etl_stylesheets", "name":"Tabelle tmp_etl_stylesheets erzeugen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"create_tmp_etl_sx_captions", "name":"Tabelle tmp_etl_sx_captions erzeugen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"upload_tmp_etl_themenbaum", "name":"tmp_etl_themenbaum hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"upload_tmp_etl_stylesheets", "name":"tmp_etl_stylesheets hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"upload_tmp_etl_mask_style", "name":"tmp_etl_mask_style hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"upload_tmp_etl_stylesheet_field", "name":"tmp_etl_stylesheet_field hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"upload_tmp_sx_captions", "name":"tmp_sx_captions hochladen", "type":"LOAD" },
{"etl_job":"sx_insert_mask", "uniquename":"masken_fuellen", "name":"masken_fuellen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"themenbaum_fuellen", "name":"themenbaum_fuellen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"sx_stylesheets_fuellen", "name":"sx_stylesheets_fuellen", "type":"DOSQL" },
{"etl_job":"sx_insert_mask", "uniquename":"sx_captions_fuellen", "name":"sx_captions_fuellen", "type":"DOSQL" },
{"etl_job":"kern_konstanten_update", "uniquename":"kern_konstanten_update", "name":"Kern Konstanten aktualisieren", "type":"DOSQL" },
@ -144,15 +128,7 @@ @@ -144,15 +128,7 @@
{"etl_job":"rpta_column_layout_upload", "uniquename":"upload_rpta_column_layout_tab", "name":"tmp_rpta_column_layout hochladen", "type":"LOAD" },
{"etl_job":"rpta_column_layout_upload", "uniquename":"upload_rpta_column_tab", "name":"tmp_rpta_column hochladen", "type":"LOAD" },
{"etl_job":"rpta_column_layout_upload", "uniquename":"upload_rpta_column2layout_tab", "name":"tmp_rpta_column2layout hochladen", "type":"LOAD" },
{"etl_job":"rpta_column_layout_upload", "uniquename":"trans_rpta_column_layout", "name":"rpta_column_layout füllen", "type":"DOSQL" },
{"etl_job":"sxc_stud_zugang_abgang_aggr_unload", "uniquename":"sxc_stud_zugang_abgang_aggr_unload_ges", "name":"Studierendenströme für SXC entladen", "type":"MSG"},
{"etl_job":"sxc_stud_zugang_abgang_aggr_unload", "uniquename":"unload_sxc_stud_zugang_abgang_aggr_tab", "name":"sxc_stud_zugang_abgang_aggr entladen", "type":"UNLOAD", "parent":"sxc_stud_zugang_abgang_aggr_unload_ges"},
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload", "uniquename":"create_tmp_sxc_stud_zugang_abgang_aggr", "name":"Tabelle tmp_sxc_stud_zugang_abgang_aggr erzeugen", "type":"DOSQL" },
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload", "uniquename":"upload_sxc_stud_zugang_abgang_aggr_tab", "name":"tmp_sxc_stud_zugang_abgang_aggr hochladen", "type":"LOAD" },
{"etl_job":"sxc_stud_zugang_abgang_aggr_upload", "uniquename":"trans_sxc_stud_zugang_abgang_aggr", "name":"sxc_stud_zugang_abgang_aggr füllen", "type":"DOSQL" }
{"etl_job":"rpta_column_layout_upload", "uniquename":"trans_rpta_column_layout", "name":"rpta_column_layout füllen", "type":"DOSQL" }
] />
<#assign etl_step_properties = [
@ -166,7 +142,6 @@ @@ -166,7 +142,6 @@
{"etl_step":"unload_sx_mask_style","prop_name":"select_stmt", "prop_value":"select maskeninfo_id,stylesheet_id,ord,(select filename from sx_stylesheets where tid=S.stylesheet_id) as stylesheet_filename from sx_mask_style S where maskeninfo_id in ( $TID ) order by 1,2,3" },
{"etl_step":"unload_sx_stylesheets","prop_name":"select_stmt", "prop_value":"select S.tid,S.filename,S.caption,S.description,S.relation,S.useragent,S.contenttype,S.is_generic,S.toolbar_icon_filepath,S.usage_resultset_data,S.stylesheet_type,S.jr_datasource from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id in ( $TID ) order by 1,2,3" },
{"etl_step":"unload_stylesheet_field","prop_name":"select_stmt", "prop_value":"select F.tid,F.stylesheet_id,S.filename as stylesheet_filename,F.tablename,F.fieldname FROM stylesheet_field F, sx_stylesheets S, sx_mask_style M where F.stylesheet_id=S.tid and S.tid=M.stylesheet_id and M.maskeninfo_id in ( $TID ) order by 1,2,3,4,5" },
{"etl_step":"unload_captions","prop_name":"select_stmt", "prop_value":"select id, table_name, field_name, record_no, locale, contents_short, contents_long, equalitystatus, sachgebiete_id, doku_link, export_to_glossar from sx_captions where table_name=''felderinfo'' and record_no in (select B.felderinfo_id from masken_felder_bez B where B.maskeninfo_id in ( $TID )) order by 1,2,3,4,5" },
{"etl_step":"create_tmp_etl_masken","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_masken.sql" },
@ -196,8 +171,7 @@ @@ -196,8 +171,7 @@
{"etl_step":"upload_maske_system_bez","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" },
{"etl_step":"create_tmp_etl_themenbaum","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_themenbaum.sql" },
{"etl_step":"create_tmp_etl_stylesheets","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_stylesheets.sql" },
{"etl_step":"create_tmp_etl_sx_captions","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_sx_captions.sql" },
{"etl_step":"upload_tmp_etl_themenbaum","prop_name":"target_table", "prop_value":"tmp_etl_themenbaum" },
{"etl_step":"upload_tmp_etl_themenbaum","prop_name":"format", "prop_value":"xml" },
{"etl_step":"upload_tmp_etl_themenbaum","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_themenbaum\"]/rs/row" },
@ -218,12 +192,6 @@ @@ -218,12 +192,6 @@
{"etl_step":"upload_tmp_etl_stylesheet_field","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_stylesheet_field\"]/rs/row" },
{"etl_step":"upload_tmp_etl_stylesheet_field","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" },
{"etl_step":"upload_tmp_sx_captions","prop_name":"target_table", "prop_value":"tmp_etl_sx_captions" },
{"etl_step":"upload_tmp_sx_captions","prop_name":"format", "prop_value":"xml" },
{"etl_step":"upload_tmp_sx_captions","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_captions\"]/rs/row" },
{"etl_step":"upload_tmp_sx_captions","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" },
{"etl_step":"create_tmp_etl_sichten","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_sichten.sql" },
{"etl_step":"upload_tmp_etl_sichten","prop_name":"target_table", "prop_value":"tmp_etl_sichten" },
{"etl_step":"upload_tmp_etl_sichten","prop_name":"format", "prop_value":"xml" },
@ -241,7 +209,6 @@ @@ -241,7 +209,6 @@
{"etl_step":"masken_fuellen","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/masken_fuellen.sql" },
{"etl_step":"themenbaum_fuellen","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/themenbaum_fuellen.sql" },
{"etl_step":"sx_stylesheets_fuellen","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/sx_stylesheets_fuellen.sql" },
{"etl_step":"sx_captions_fuellen","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/sx_captions_fuellen.sql" },
{"etl_step":"kern_konstanten_update","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" },
@ -299,20 +266,7 @@ @@ -299,20 +266,7 @@
{"etl_step":"unload_qa_mask_execution_tab","prop_name":"select_stmt", "prop_value":"SELECT E.name,E.userinfo_id,E.maskeninfo_id,E.is_active,E.stylesheet_id,E.contenttype,E.output_filename,E.systeminfo_id,E.uniquename FROM qa_mask_execution E where E.tid in (select P.mask_execution_id from qa_mask_execution2project P where P.project_id= $QA_PROJECT_ID ) order by 1;" },
{"etl_step":"unload_qa_mask_execution_assert_tab","prop_name":"select_stmt", "prop_value":"SELECT E.uniquename,A.rownr,A.colnr,A.result_value_min,A.result_value_max,A.is_active,A.caption FROM qa_mask_execution E, qa_mask_execution_assert A where E.tid=A.mask_execution_id and E.tid in (select P.mask_execution_id from qa_mask_execution2project P where P.project_id= $QA_PROJECT_ID ) order by 1;" },
{"etl_step":"unload_qa_mask_execution2project_tab","prop_name":"select_stmt", "prop_value":"SELECT E.uniquename as mask_execution_uniquename,P.uniquename as project_uniquename,DP.issue_id FROM qa_mask_execution2project DP, qa_mask_execution E, qa_project P where DP.mask_execution_id=E.tid and DP.project_id=P.tid and DP.project_id= $QA_PROJECT_ID order by 1;" },
{"etl_step":"unload_sxc_stud_zugang_abgang_aggr_ges","prop_name":"msg", "prop_value":"Entlade Studierendenströme für SXC $HS_NR" },
{"etl_step":"unload_sxc_stud_zugang_abgang_aggr_tab","prop_name":"select_stmt", "prop_value":"SELECT A.* from sxc_stud_zugang_abgang_aggr A where val(A.hs_nr) in ( $HS_NR ) order by 1;" },
{"etl_step":"create_tmp_sxc_stud_zugang_abgang_aggr","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_sxc_stud_zugang_abgang_aggr.sql" },
{"etl_step":"upload_sxc_stud_zugang_abgang_aggr_tab","prop_name":"target_table", "prop_value":"tmp_sxc_stud_zugang_abgang_aggr" },
{"etl_step":"upload_sxc_stud_zugang_abgang_aggr_tab","prop_name":"format", "prop_value":"xml" },
{"etl_step":"upload_sxc_stud_zugang_abgang_aggr_tab","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_sxc_stud_zugang_abgang_aggr_tab\"]/rs/row" },
{"etl_step":"upload_sxc_stud_zugang_abgang_aggr_tab","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" },
{"etl_step":"trans_sxc_stud_zugang_abgang_aggr","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/trans_sxc_stud_zugang_abgang_aggr.sql" }
{"etl_step":"unload_qa_mask_execution2project_tab","prop_name":"select_stmt", "prop_value":"SELECT E.uniquename as mask_execution_uniquename,P.uniquename as project_uniquename,DP.issue_id FROM qa_mask_execution2project DP, qa_mask_execution E, qa_project P where DP.mask_execution_id=E.tid and DP.project_id=P.tid and DP.project_id= $QA_PROJECT_ID order by 1;" }

6
src-modules/module/etl/schluesseltabellen/fm_templates.unl

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
157^ETL_MAKROS^<#macro ETL_STEPS_FUELLEN>\
17^ETL_MAKROS^<#macro ETL_STEPS_FUELLEN>\
<@etl_steps_def_check/>\
\
<#-- Hinterlegen von Defaultwerten für step_properties -->\
@ -423,7 +423,7 @@ drop table tmp_etl_job_param;\ @@ -423,7 +423,7 @@ drop table tmp_etl_job_param;\
drop table tmp_etl_step_property;\
drop table tmp_etl_step_relation;\
\
<#if testfaelle?exists && testfaelle?has_content>\
\
<#foreach testfall in testfaelle>\
select 'testfall ${testfall.testcase}: ERFOLG'\
from xdummy\
@ -436,7 +436,7 @@ where ${testfall.assertion}!=(${testfall.sql})\ @@ -436,7 +436,7 @@ where ${testfall.assertion}!=(${testfall.sql})\
\
\
</#foreach> --Ende Testfälle\
</#if>\
\
<#foreach etl_step_property in etl_step_properties>\
update etl_step_property set prop_value='${etl_step_property.prop_value}' where prop_name='${etl_step_property.prop_name}' and etl_step_id=(select S.tid from etl_step S where S.uniquename='${etl_step_property.etl_step}');\
</#foreach>\

25
src-modules/module/etl/schluesseltabellen/sx_captions_fuellen.sql

@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
delete from sx_captions where table_name='felderinfo'
and (table_name, record_no) in
(select T.table_name,T.record_no
from tmp_etl_sx_captions T)
;
insert into sx_captions (id,
table_name,
field_name,
record_no,
locale,
contents_short,
contents_long)
select id,
table_name,
field_name,
record_no,
locale,
contents_short,
contents_long
from tmp_etl_sx_captions;
drop table tmp_etl_sx_captions;

16
src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql

@ -18,7 +18,6 @@ from tmp_etl_rpta_column_layout; @@ -18,7 +18,6 @@ from tmp_etl_rpta_column_layout;
select C.uniquename,
null::varchar(255) as caption,
C.caption as caption_der_spalte,
L.sortnr,
L.caption as caption_in_ergebnistabelle,
C.srcfieldname,
C.targetfieldname,
@ -108,8 +107,9 @@ FROM rpta_resultset @@ -108,8 +107,9 @@ FROM rpta_resultset
where uniquename='${rpta_column_layout.rpta_resultset}';
<#assign sortnr=0 />
<#foreach column in rpta_columns>
<#assign sortnr=sortnr +1 />
INSERT INTO tmp_rpta_column
(resultset_id,
@ -130,7 +130,7 @@ INSERT INTO tmp_rpta_column @@ -130,7 +130,7 @@ INSERT INTO tmp_rpta_column
)
select R.tid,
'${column.uniquename}',
<#if column.caption?exists && column.caption !="">
<#if column.caption?exists>
'${column.caption}',
<#else>
'${column.caption_der_spalte}',
@ -143,11 +143,11 @@ select R.tid, @@ -143,11 +143,11 @@ select R.tid,
'${column.srcfieldname}',
<#if !column.targetfieldname?exists || column.targetfieldname=="">'${column.srcfieldname}' <#else>'${column.targetfieldname}' </#if>,
T.tid as column_type,
<#if column.col_function?exists>'${column.col_function}'<#else>null::varchar </#if> as col_function,
${column.is_visible} as is_visible,
<#if column.visible_size?exists && column.visible_size?string !="" > ${column.visible_size} <#else>null::integer </#if> as visible_size,
${column.is_aggregate} as is_aggregate,
${column.sortnr} as sortnr,
<#if column.col_function?exists>'${column.col_function}'<#else>null::varchar </#if>,
${column.is_visible},
${column.visible_size},
${column.is_aggregate},
${sortnr*10},
<#if column.description?exists>'${column.description}'<#elseif column.description_der_spalte?exists>'${column.description_der_spalte}'<#else>null::varchar </#if>,
<#if column.description_in_ergebnistabelle?exists>'${column.description_in_ergebnistabelle}'<#elseif column.description?exists>'${column.description}'<#else>null::varchar </#if>,
<#if column.format_code?exists>'${column.format_code}'<#else>null::varchar </#if>

42
src-modules/module/etl/schluesseltabellen/trans_sxc_stud_zugang_abgang_aggr.sql

@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
--freemarker template
<#include "SQL_lingua_franca"/>
<#include "SuperX_general"/>
<#include "RPTA-Makros"/>
delete from sxc_stud_zugang_abgang_aggr
where hs_nr in (select distinct M.hs_nr
from tmp_sxc_stud_zugang_abgang_aggr M)
;
insert into sxc_stud_zugang_abgang_aggr(
hs_nr,
jahr,
anfangsbestand,
zugang,
zugang_ersteinschr,
abgang,
abgang_hauptpr,
abgang_ohne_hauptpr,
hauptpr_summe,
hauptpr_bleibt,
endbestand,
datenstand)
select
hs_nr,
jahr,
anfangsbestand,
zugang,
zugang_ersteinschr,
abgang,
abgang_hauptpr,
abgang_ohne_hauptpr,
hauptpr_summe,
hauptpr_bleibt,
endbestand,
datenstand
from tmp_sxc_stud_zugang_abgang_aggr
;
drop table tmp_sxc_stud_zugang_abgang_aggr;

1
superx/edit/etl/etl_manager.jsp

@ -144,7 +144,6 @@ var fldElem=document.getElementById(mydiv); @@ -144,7 +144,6 @@ var fldElem=document.getElementById(mydiv);
function EtlMaskeComboLaden(fname,zeilenanzahl, caption,maskentid) {
var editurl="/superx/edit/kern/maske_combo_laden.jsp?tid="+maskentid+ "&Feldname="+getEncoded(fname);
editurl +="&referrerForm=saveEtlXml";
editurl +="&zeilenanzahl="+zeilenanzahl+"&params=";
neu2=window.open(editurl,"_blank","directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=660");
return false;

Loading…
Cancel
Save