diff --git a/.classpath b/.classpath index c2c8751..ee8d016 100644 --- a/.classpath +++ b/.classpath @@ -14,5 +14,10 @@ + + + + + diff --git a/build.xml b/build.xml index 0b2e8b6..55b8482 100644 --- a/build.xml +++ b/build.xml @@ -38,7 +38,7 @@ ant -DWEBAPP=$WEBAPP cleanBuildPath - + @@ -124,7 +124,7 @@ ant -DWEBAPP=$WEBAPP cleanBuildPath - + diff --git a/src-modules/module/etl/bin/etl_dosql.x b/src-modules/module/etl/bin/etl_dosql.x index 2d0d7fb..46753e4 100755 --- a/src-modules/module/etl/bin/etl_dosql.x +++ b/src-modules/module/etl/bin/etl_dosql.x @@ -55,7 +55,7 @@ then if [ "$LANG" != "" ] then LOCALE="-Duser.language=$LANG" fi - java $LOCALE -cp $CP $JAVA_OPTS de.superx.etl.bin.Dosql -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -sqlfile:"$filename" -outFormat:"txt" -delim:$DBDELIMITER -header:$header -outfile:$outfile -params:$params + java $LOCALE -cp $CP $JAVA_OPTS de.superx.elt.bin.Dosql -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -sqlfile:"$filename" -outFormat:"txt" -delim:$DBDELIMITER -header:$header -outfile:$outfile -params:$params else case $SX_CLIENT in @@ -65,7 +65,7 @@ jdbc) if [ "$LANG" != "" ] then LOCALE="-Duser.language=$LANG" fi - java $LOCALE -cp $CP $JAVA_OPTS de.superx.etl.bin.Dosql -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -sqlfile:"$filename" -outFormat:"txt" -delim:$DBDELIMITER -header:$header -outfile:$outfile -params:$params + java $LOCALE -cp $CP $JAVA_OPTS de.superx.elt.bin.Dosql -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -sqlfile:"$filename" -outFormat:"txt" -delim:$DBDELIMITER -header:$header -outfile:$outfile -params:$params ;; psql) diff --git a/src-modules/module/etl/bin/etl_sx_insert_mask.x b/src-modules/module/etl/bin/etl_sx_insert_mask.x index 247821b..e689130 100755 --- a/src-modules/module/etl/bin/etl_sx_insert_mask.x +++ b/src-modules/module/etl/bin/etl_sx_insert_mask.x @@ -59,7 +59,7 @@ SX_CLIENT=jdbc export SX_CLIENT CP=".:$JDBC_CLASSPATH" -CMD="java $JAVA_OPTS -cp $CP de.superx.etl.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:sx_insert_mask -params:TID=$TID,PATH_TO_INPUTFILE=$infile" +CMD="java $JAVA_OPTS -cp $CP de.superx.elt.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:sx_insert_mask -params:TID=$TID,PATH_TO_INPUTFILE=$infile" $CMD diff --git a/src-modules/module/etl/bin/etl_sx_select_mask.x b/src-modules/module/etl/bin/etl_sx_select_mask.x index 0712929..7a5d4c2 100755 --- a/src-modules/module/etl/bin/etl_sx_select_mask.x +++ b/src-modules/module/etl/bin/etl_sx_select_mask.x @@ -36,7 +36,7 @@ SX_CLIENT=jdbc export SX_CLIENT CP=".:$JDBC_CLASSPATH" -CMD="java $JAVA_OPTS -cp $CP de.superx.etl.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:sx_select_mask -outfile:$outfile -params:TID=$TID" +CMD="java $JAVA_OPTS -cp $CP de.superx.elt.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:sx_select_mask -outfile:$outfile -params:TID=$TID" echo $CMD diff --git a/src-modules/module/etl/bin/etl_sx_unload_records.x b/src-modules/module/etl/bin/etl_sx_unload_records.x index 645e5b8..7a06461 100755 --- a/src-modules/module/etl/bin/etl_sx_unload_records.x +++ b/src-modules/module/etl/bin/etl_sx_unload_records.x @@ -41,6 +41,6 @@ CP=".:$JDBC_CLASSPATH" echo "Unload $table to $filename" -java $LOCALE -cp "$CP" de.superx.etl.bin.Doquery $LOGGER_PROPERTIES $DB_PROPERTIES 'select * from '$table $outformat $DBDELIMITER $header $filename +java $LOCALE -cp "$CP" de.superx.elt.bin.Doquery $LOGGER_PROPERTIES $DB_PROPERTIES 'select * from '$table $outformat $DBDELIMITER $header $filename diff --git a/src-modules/module/etl/bin/etl_sx_upload_records.x b/src-modules/module/etl/bin/etl_sx_upload_records.x index 4372975..a72a7a0 100755 --- a/src-modules/module/etl/bin/etl_sx_upload_records.x +++ b/src-modules/module/etl/bin/etl_sx_upload_records.x @@ -40,7 +40,7 @@ fi echo "$tabelle wird aus der Datei $quelldatei gefüllt" CP=".:$JDBC_CLASSPATH" -CMD="java $JAVA_OPTS -cp $CP de.superx.etl.bin.UploadRecords -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -table:$tabelle -unl:$quelldatei -delim:$DBDELIMITER -header:$header -informat:$informat -encoding:$encoding" +CMD="java $JAVA_OPTS -cp $CP de.superx.elt.bin.UploadRecords -logger:$LOGGER_PROPERTIES -dbproperties:$DB_PROPERTIES -table:$tabelle -unl:$quelldatei -delim:$DBDELIMITER -header:$header -informat:$informat -encoding:$encoding" $CMD diff --git a/src-modules/module/etl/conf/etl.xml b/src-modules/module/etl/conf/etl.xml index 2d85cd1..75fd6e1 100644 --- a/src-modules/module/etl/conf/etl.xml +++ b/src-modules/module/etl/conf/etl.xml @@ -1,6 +1,6 @@ - diff --git a/src-modules/module/etl/schluesseltabellen/create_load_etl_stylesheets.sql b/src-modules/module/etl/schluesseltabellen/create_load_etl_stylesheets.sql new file mode 100644 index 0000000..5c20b31 --- /dev/null +++ b/src-modules/module/etl/schluesseltabellen/create_load_etl_stylesheets.sql @@ -0,0 +1,45 @@ +--Freemarker Template + +--used in etl-job sx_insert_mask +<#if SQLdialect='Postgres'> +drop table if exists tmp_etl_stylesheets; +drop table if exists tmp_etl_mask_style; +drop table if exists tmp_etl_stylesheet_field; + + + +create table tmp_etl_stylesheets( + tid integer , + filename character(255), + caption character(255), + description character(255), + relation character(10), + useragent character(255), + contenttype character(200), +is_generic SMALLINT default 0 , +toolbar_icon_filepath VARCHAR(255) , +usage_resultset_data CHAR(10) default 'T' , +stylesheet_type CHAR(10) default 'XSL' , +jr_datasource CHAR(10) +); + + +CREATE TABLE tmp_etl_mask_style ( +-- tid integer , + maskeninfo_id integer, + stylesheet_id integer, + ord smallint, + stylesheet_filename character(255) + +); + + +CREATE TABLE tmp_etl_stylesheet_field ( + tid integer , + stylesheet_id integer, + stylesheet_filename character(255), + tablename character(255), + fieldname character(255) +); + + diff --git a/src-modules/module/etl/schluesseltabellen/create_load_etl_themenbaum.sql b/src-modules/module/etl/schluesseltabellen/create_load_etl_themenbaum.sql new file mode 100644 index 0000000..c26d2b8 --- /dev/null +++ b/src-modules/module/etl/schluesseltabellen/create_load_etl_themenbaum.sql @@ -0,0 +1,25 @@ +--Freemarker Template + +--used in etl-job sx_insert_mask +<#if SQLdialect='Postgres'> +drop table if exists tmp_etl_themenbaum; + + + + + +CREATE TABLE tmp_etl_themenbaum ( +-- tid integer, + name varchar(255) NOT NULL, + maskeninfo_id integer, + parent integer, + parent_name varchar(255), + gueltig_seit date, + gueltig_bis date, + erlaeuterung char(240), + sort integer DEFAULT 0 NOT NULL, + css_class varchar(255) +); + + + diff --git a/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql b/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql index cf40c03..7ec701c 100644 --- a/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql +++ b/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql @@ -44,6 +44,8 @@ {"etl_job":"sx_select_mask", "uniquename":"unload_maske_system_bez", "name":"maske_system_bez entladen", "type":"UNLOAD", "parent":"unload_masken_stammdaten"}, {"etl_job":"sx_select_mask", "uniquename":"unload_themenbaum", "name":"themenbaum entladen", "type":"UNLOAD"}, {"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_insert_mask", "uniquename":"delete_maskeninfo", "name":"Maskeninfo löschen", "type":"DOQUERY" }, {"etl_job":"sx_insert_mask", "uniquename":"upload_maskeninfo", "name":"Maskeninfo hochladen", "type":"LOAD" }, @@ -61,7 +63,17 @@ {"etl_job":"sx_insert_mask", "uniquename":"delete_maske_system_bez", "name":"maske_system_bez löschen", "type":"DOQUERY" }, {"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":"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":"themenbaum_fuellen", "name":"themenbaum_fuellen", "type":"DOSQL" }, + {"etl_job":"sx_insert_mask", "uniquename":"sx_stylesheets_fuellen", "name":"sx_stylesheets_fuellen", "type":"DOSQL" }, + {"etl_job":"kern_konstanten_update", "uniquename":"kern_konstanten_update", "name":"Kern Konstanten aktualisieren", "type":"DOSQL" }, {"etl_job":"sichten_unload", "uniquename":"unload_sichten_ges", "name":"Sichten entladen", "type":"MSG"}, @@ -84,6 +96,8 @@ {"etl_step":"unload_maske_system_bez","prop_name":"select_stmt", "prop_value":"select maskeninfo_id,systeminfo_id from maske_system_bez where maskeninfo_id=$TID order by 1,2" }, {"etl_step":"unload_themenbaum","prop_name":"select_stmt", "prop_value":"select name,maskeninfo_id,parent,(select name from themenbaum where tid=T.parent) as parent_name,gueltig_seit,gueltig_bis,erlaeuterung,sort,css_class from themenbaum T where maskeninfo_id=$TID order by 2,1" }, {"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=$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=$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=$TID order by 1,2,3,4,5" }, {"etl_step":"delete_maskeninfo","prop_name":"select_stmt", "prop_value":"delete from maskeninfo where tid=$TID" }, {"etl_step":"upload_maskeninfo","prop_name":"target_table", "prop_value":"maskeninfo" }, @@ -114,6 +128,31 @@ {"etl_step":"upload_maske_system_bez","prop_name":"format", "prop_value":"xml" }, {"etl_step":"upload_maske_system_bez","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_maske_system_bez\"]/rs/row" }, {"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":"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" }, + {"etl_step":"upload_tmp_etl_themenbaum","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" }, + + {"etl_step":"upload_tmp_etl_stylesheets","prop_name":"target_table", "prop_value":"tmp_etl_stylesheets" }, + {"etl_step":"upload_tmp_etl_stylesheets","prop_name":"format", "prop_value":"xml" }, + {"etl_step":"upload_tmp_etl_stylesheets","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_sx_stylesheets\"]/rs/row" }, + {"etl_step":"upload_tmp_etl_stylesheets","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" }, + + {"etl_step":"upload_tmp_etl_mask_style","prop_name":"target_table", "prop_value":"tmp_etl_mask_style" }, + {"etl_step":"upload_tmp_etl_mask_style","prop_name":"format", "prop_value":"xml" }, + {"etl_step":"upload_tmp_etl_mask_style","prop_name":"search_path", "prop_value":"/etlAction/unload [@name=\"unload_sx_mask_style\"]/rs/row" }, + {"etl_step":"upload_tmp_etl_mask_style","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" }, + + {"etl_step":"upload_tmp_etl_stylesheet_field","prop_name":"target_table", "prop_value":"tmp_etl_stylesheet_field" }, + {"etl_step":"upload_tmp_etl_stylesheet_field","prop_name":"format", "prop_value":"xml" }, + {"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":"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":"kern_konstanten_update","prop_name":"path_to_inputfile", "prop_value":"$PATH_TO_INPUTFILE" }, @@ -131,8 +170,8 @@ {"testcase":"test_sx_select_mask","assertion":1, "sql":"select count(*) from etl_job where uniquename='sx_select_mask'" }, {"testcase":"test_sx_insert_mask","assertion":1, "sql":"select count(*) from etl_job where uniquename='sx_insert_mask'" }, {"testcase":"test_sx_insert_mask_params","assertion":3, "sql":"select count(*) from etl_job_param P, etl_job J where J.tid=P.etl_job_id and J.uniquename='sx_insert_mask'" }, - {"testcase":"test_sx_insert_mask_steps","assertion":10, "sql":"select count(*) from etl_step S, etl_step_relation R, etl_job J where J.tid=R.job_id and S.tid=R.step_id and J.uniquename='sx_insert_mask'" }, - {"testcase":"test_sx_select_mask_steps","assertion":8, "sql":"select count(*) from etl_step S, etl_step_relation R, etl_job J where J.tid=R.job_id and S.tid=R.step_id and J.uniquename='sx_select_mask'" } + {"testcase":"test_sx_insert_mask_steps","assertion":18, "sql":"select count(*) from etl_step S, etl_step_relation R, etl_job J where J.tid=R.job_id and S.tid=R.step_id and J.uniquename='sx_insert_mask'" }, + {"testcase":"test_sx_select_mask_steps","assertion":10, "sql":"select count(*) from etl_step S, etl_step_relation R, etl_job J where J.tid=R.job_id and S.tid=R.step_id and J.uniquename='sx_select_mask'" } ] /> @@ -198,6 +237,34 @@ custom_step SMALLINT default 1 ) ; +--jobs with custom_job=0 get deleted in HISinOne-BI +--therefore set to 2: +update etl_job set custom_job=2 +where custom_job=0 +and uniquename in ('sx_select_mask','sx_insert_mask', +'kern_konstanten_update', +'sichten_unload', +'sos_gewichtung_unload'); + + +update etl_step set custom_step=2 +where custom_step=0 +and tid in (select R.step_id from etl_step_relation R, etl_job J +where R.job_id=J.tid +and J.uniquename in ('sx_select_mask','sx_insert_mask', +'kern_konstanten_update', +'sichten_unload', +'sos_gewichtung_unload')); + +update etl_step_relation set custom_step=2 +where custom_step=0 +and job_id in (select J.tid +from etl_job J +where J.uniquename in ('sx_select_mask','sx_insert_mask', +'kern_konstanten_update', +'sichten_unload', +'sos_gewichtung_unload')); + <#foreach etl_job in etl_jobs> truncate table tmp_etl_job; @@ -216,7 +283,7 @@ insert into tmp_etl_job(uniquename,caption,systeminfo_id,logfile,already_exists, values ('${etl_job.uniquename}', '${etl_job.name}', ${etl_job.systeminfo_id}, -'${etl_job.logfile}',0,0); +'${etl_job.logfile}',0,2); <#if SQLdialect='Postgres'> --Postgres Dialekt: @@ -329,7 +396,7 @@ J.tid as etl_job_id, J.uniquename, '${etl_job.logfile}' as logfile, -0, +2, 0 from etl_job J where J.uniquename='${etl_job.uniquename}' @@ -453,7 +520,7 @@ FROM tmp_etl_step T ) delete from etl_step_relation where job_id in (select J.tid FROM tmp_etl_job J) -and custom_step=0 +and custom_step=2 ; @@ -500,7 +567,7 @@ select 0 as force_continue, 1 as step_active, sortnr, - 0 + 2 FROM tmp_etl_step ; @@ -546,28 +613,12 @@ where ${testfall.assertion}!=(${testfall.sql}) --Ende Testfälle -<#if SQLdialect='Informix'> ---nun xupdates: ---bei informix kann man TEXT Spalten nicht updaten, daher per jdbc updaten: ---damit DOSQL nicht den xupdater beim Start dieses Scriptes anwirft, ---wird das in eine temp. Datei ausgelagert. -! echo "" > "./tmp"$MANDANTID".sql" -<#foreach etl_step_property in etl_step_properties> - -! echo '${etl_step_property.prop_value}' >>"./tmp"$MANDANTID".sql" - - - -! echo "" >> "./tmp"$MANDANTID".sql" -! DOSQL "./tmp"$MANDANTID".sql" -<#else> ---Postgres: <#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}'); - + diff --git a/src-modules/module/etl/schluesseltabellen/etl_step_type.unl b/src-modules/module/etl/schluesseltabellen/etl_step_type.unl index 8c108c2..38ff924 100644 --- a/src-modules/module/etl/schluesseltabellen/etl_step_type.unl +++ b/src-modules/module/etl/schluesseltabellen/etl_step_type.unl @@ -1,5 +1,5 @@ -1^LOAD^Tabelle hochladen^de.superx.etl.ActionHandler.EtlActionHandlerUploadRecords^ -2^DOSQL^SQL-Script ausführen^de.superx.etl.ActionHandler.EtlActionHandlerDosql^ -3^DOQUERY^SQL-Query ausführen^de.superx.etl.ActionHandler.EtlActionHandlerDoquery^ -4^UNLOAD^SQL-Ergebnis entladen^de.superx.etl.ActionHandler.EtlActionHandlerUnloadRecords^ -5^MSG^Logausgabe^de.superx.etl.ActionHandler.EtlActionHandlerMsg^ +1^LOAD^Tabelle hochladen^de.superx.elt.ActionHandler.EtlActionHandlerUploadRecords^ +2^DOSQL^SQL-Script ausführen^de.superx.elt.ActionHandler.EtlActionHandlerDosql^ +3^DOQUERY^SQL-Query ausführen^de.superx.elt.ActionHandler.EtlActionHandlerDoquery^ +4^UNLOAD^SQL-Ergebnis entladen^de.superx.elt.ActionHandler.EtlActionHandlerUnloadRecords^ +5^MSG^Logausgabe^de.superx.elt.ActionHandler.EtlActionHandlerMsg^ diff --git a/src-modules/module/etl/schluesseltabellen/sx_stylesheets_fuellen.sql b/src-modules/module/etl/schluesseltabellen/sx_stylesheets_fuellen.sql index 2c92a37..fd0880c 100644 --- a/src-modules/module/etl/schluesseltabellen/sx_stylesheets_fuellen.sql +++ b/src-modules/module/etl/schluesseltabellen/sx_stylesheets_fuellen.sql @@ -7,18 +7,69 @@ update tmp_etl_stylesheets set tid=(select S.tid from sx_stylesheets S where S.filename=tmp_etl_stylesheets.filename); +--update metadata: +update sx_stylesheets set (filename, + caption, + description, + relation, + useragent, + contenttype, + is_generic, + toolbar_icon_filepath, + usage_resultset_data, + stylesheet_type, + jr_datasource) + =(select filename, + caption, + description, + relation, + useragent, + contenttype, + is_generic, + toolbar_icon_filepath, + usage_resultset_data, + stylesheet_type, + jr_datasource + from tmp_etl_stylesheets T + where T.tid=sx_stylesheets.tid) +where tid in (select tid from tmp_etl_stylesheets); + + + --new Stylesheet? -insert into sx_stylesheets(filename,caption,description,relation,contenttype) -select filename,caption,description,relation,contenttype +insert into sx_stylesheets(filename,caption,description,relation,contenttype, + is_generic, toolbar_icon_filepath, usage_resultset_data, stylesheet_type, jr_datasource) +select filename,caption,description,relation,contenttype, +is_generic, toolbar_icon_filepath, usage_resultset_data, stylesheet_type, jr_datasource from tmp_etl_stylesheets where tid is null; +--abwärtskompatibel: +update sx_stylesheets set stylesheet_type='XSL', +usage_resultset_data='T' +where relation='table' +and trim(filename) like '%.xsl'; + + +update sx_stylesheets set stylesheet_type='JRXML', +jr_datasource='RS', +usage_resultset_data='T' +where relation='table' +and trim(filename) like '%.jrxml' +; +update sx_stylesheets set stylesheet_type='JRXML', +jr_datasource='XML', +usage_resultset_data='T' +where relation='table' +and trim(filename) like '%xmlsource.jrxml' +; + + --lookup tid: update tmp_etl_stylesheets set tid=(select S.tid from sx_stylesheets S where S.filename=tmp_etl_stylesheets.filename); - delete from sx_mask_style where maskeninfo_id in (select maskeninfo_id from tmp_etl_mask_style); diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandler.java b/src/de/superx/elt/ActionHandler/EtlActionHandler.java similarity index 97% rename from src/de/superx/etl/ActionHandler/EtlActionHandler.java rename to src/de/superx/elt/ActionHandler/EtlActionHandler.java index a0f1db8..7587ebe 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandler.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandler.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; @@ -16,7 +16,7 @@ import java.util.Properties; import java.util.logging.Logger; import de.superx.bin.SxConnection; -import de.superx.etl.EtlStep; +import de.superx.elt.EtlStep; diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerDoquery.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerDoquery.java similarity index 91% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerDoquery.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerDoquery.java index b05dba5..b3b71f0 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerDoquery.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerDoquery.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; @@ -14,8 +14,8 @@ import java.util.Properties; import java.util.logging.Logger; import de.superx.bin.SxConnection; -import de.superx.etl.QueryResultSerializer; -import de.superx.etl.SqlExecutor; +import de.superx.elt.QueryResultSerializer; +import de.superx.elt.SqlExecutor; public class EtlActionHandlerDoquery extends EtlActionHandler implements EtlActionHandlerI { diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerDosql.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerDosql.java similarity index 85% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerDosql.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerDosql.java index ad4c943..b30eb2d 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerDosql.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerDosql.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.File; import java.io.StringWriter; @@ -15,8 +15,9 @@ import java.util.Properties; import java.util.logging.Logger; import de.superx.bin.SxConnection; -import de.superx.etl.QueryResultSerializer; -import de.superx.etl.SqlExecutor; +import de.superx.elt.EtlUtils; +import de.superx.elt.QueryResultSerializer; +import de.superx.elt.SqlExecutor; public class EtlActionHandlerDosql extends EtlActionHandler implements EtlActionHandlerI { @@ -31,7 +32,9 @@ public class EtlActionHandlerDosql extends EtlActionHandler implements EtlAction String log=""; long numberOfRows=0; this.getConnection(); - String filename=handlerSpecificProperties.getProperty("PATH_TO_INPUTFILE"); + Properties myProps=EtlUtils.replaceSUPERX_DIRandETL_PFAD(handlerSpecificProperties); + + String filename=myProps.getProperty("PATH_TO_INPUTFILE"); File sqlScriptFile = null; try { sqlScriptFile = new File(filename); diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerI.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerI.java similarity index 96% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerI.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerI.java index 84bd0b0..bf1d674 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerI.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerI.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerMsg.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerMsg.java similarity index 95% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerMsg.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerMsg.java index 07d9797..f60dd97 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerMsg.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerMsg.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerUnloadRecords.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerUnloadRecords.java similarity index 94% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerUnloadRecords.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerUnloadRecords.java index 5999f1b..454bbb4 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerUnloadRecords.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerUnloadRecords.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; @@ -14,7 +14,7 @@ import java.util.Properties; import java.util.logging.Logger; import de.superx.bin.SxConnection; -import de.superx.etl.QueryResultSerializer; +import de.superx.elt.QueryResultSerializer; public class EtlActionHandlerUnloadRecords extends EtlActionHandler implements EtlActionHandlerI { diff --git a/src/de/superx/etl/ActionHandler/EtlActionHandlerUploadRecords.java b/src/de/superx/elt/ActionHandler/EtlActionHandlerUploadRecords.java similarity index 94% rename from src/de/superx/etl/ActionHandler/EtlActionHandlerUploadRecords.java rename to src/de/superx/elt/ActionHandler/EtlActionHandlerUploadRecords.java index 3f67962..3e679e0 100644 --- a/src/de/superx/etl/ActionHandler/EtlActionHandlerUploadRecords.java +++ b/src/de/superx/elt/ActionHandler/EtlActionHandlerUploadRecords.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.ActionHandler; +package de.superx.elt.ActionHandler; import java.io.StringWriter; import java.sql.Connection; @@ -14,8 +14,8 @@ import java.util.Properties; import java.util.logging.Logger; import de.superx.bin.SxConnection; -import de.superx.etl.QueryResultSerializer; -import de.superx.etl.TableUploader; +import de.superx.elt.QueryResultSerializer; +import de.superx.elt.TableUploader; public class EtlActionHandlerUploadRecords extends EtlActionHandler implements EtlActionHandlerI { diff --git a/src/de/superx/etl/EtlAction.java b/src/de/superx/elt/EtlAction.java similarity index 96% rename from src/de/superx/etl/EtlAction.java rename to src/de/superx/elt/EtlAction.java index 45188f3..804357e 100644 --- a/src/de/superx/etl/EtlAction.java +++ b/src/de/superx/elt/EtlAction.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.BufferedReader; import java.io.File; @@ -26,6 +26,7 @@ import javax.sql.DataSource; import de.superx.bin.SxConnection; import de.superx.common.Sichten; +import de.superx.etl.EtlUtils; public class EtlAction { protected Properties params; @@ -182,7 +183,7 @@ public class EtlAction { } public Connection getConnection(Connection myConnection) throws Exception { - String myDefaultPropFile=de.superx.etl.EtlUtils.WEBINFDIR+de.superx.etl.EtlUtils.PATHSEP+"db.properties"; + String myDefaultPropFile=de.superx.elt.EtlUtils.WEBINFDIR+de.superx.elt.EtlUtils.PATHSEP+"db.properties"; if(myConnection==null) { if(propfile==null) diff --git a/src/de/superx/etl/EtlActionJob.java b/src/de/superx/elt/EtlActionJob.java similarity index 97% rename from src/de/superx/etl/EtlActionJob.java rename to src/de/superx/elt/EtlActionJob.java index bba4e1d..d80b091 100644 --- a/src/de/superx/etl/EtlActionJob.java +++ b/src/de/superx/elt/EtlActionJob.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.IOException; import java.io.PrintStream; @@ -27,6 +27,7 @@ import de.superx.common.SuperX_el; import de.superx.common.SxResultRow; import de.superx.common.SxResultSet; import de.superx.common.SxSqlHelper; +import de.superx.etl.EtlUtils; import de.superx.servlet.SxPools; import de.superx.util.SqlStringUtils; import freemarker.template.TemplateBooleanModel; @@ -122,7 +123,7 @@ public class EtlActionJob extends EtlAction { super.addActionLog("Runtime Params: "+runtimeParamsArg); } if(runTimeParams!=null) - this.setParams(de.superx.etl.EtlUtils.mergeParamProperties(this.getParams(), runTimeParams)); + this.setParams(de.superx.elt.EtlUtils.mergeParamProperties(this.getParams(), runTimeParams)); super.addActionLog("Job "+jobCaption+ " initialized"); } public int execute(String outfile) throws SQLException, Exception @@ -219,7 +220,7 @@ public class EtlActionJob extends EtlAction { else { try { - de.superx.etl.EtlUtils.saveFileContentsWithEncoding(outfile, sw.toString(), null); + de.superx.elt.EtlUtils.saveFileContentsWithEncoding(outfile, sw.toString(), null); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/de/superx/etl/EtlStep.java b/src/de/superx/elt/EtlStep.java similarity index 99% rename from src/de/superx/etl/EtlStep.java rename to src/de/superx/elt/EtlStep.java index 6426be7..0b4bb5e 100644 --- a/src/de/superx/etl/EtlStep.java +++ b/src/de/superx/elt/EtlStep.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.InputStream; @@ -27,7 +27,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.datasource.DriverManagerDataSource; -import de.superx.etl.ActionHandler.*; import de.memtext.rights.RightsKeyEntry; import de.memtext.util.GetOpts; import de.superx.bin.Doquery; @@ -36,6 +35,7 @@ import de.superx.common.SuperX_el; import de.superx.common.SxResultRow; import de.superx.common.SxResultSet; import de.superx.common.SxSqlHelper; +import de.superx.elt.ActionHandler.*; import de.superx.servlet.SxPools; import de.superx.util.SqlStringUtils; import freemarker.template.TemplateBooleanModel; diff --git a/src/de/superx/etl/EtlUtils.java b/src/de/superx/elt/EtlUtils.java similarity index 93% rename from src/de/superx/etl/EtlUtils.java rename to src/de/superx/elt/EtlUtils.java index d50706e..fee9be3 100644 --- a/src/de/superx/etl/EtlUtils.java +++ b/src/de/superx/elt/EtlUtils.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -53,7 +53,7 @@ public static void main(String args[]) { try { String tidInXmlFile=""; - Document mydomres =de.superx.etl.EtlUtils.buildDocumentFromXmlFile("/home/superx/devel_module/community/tomcat/temp/myTempFile6460222908896375059.xml"); + Document mydomres =de.superx.elt.EtlUtils.buildDocumentFromXmlFile("/home/superx/devel_module/community/tomcat/temp/myTempFile6460222908896375059.xml"); XPathFactory factory = new net.sf.saxon.xpath.XPathFactoryImpl(); XPath xPath = factory.newXPath(); @@ -91,6 +91,14 @@ public static Properties convertStringToProperty(String inp) throws IOException myProps.load(new StringReader(inp)); return myProps; } +public static Properties replaceSUPERX_DIRandETL_PFAD(Properties params) throws IOException +{ + Properties returnProperties=new Properties(); + Properties pathParams =convertStringToProperty("SUPERX_DIR="+SUPERX_DIR); + returnProperties=mergeParamProperties(params,pathParams); + return returnProperties; +} + public static Properties mergeParamProperties(Properties params, Properties runTimeParams) { @@ -310,7 +318,7 @@ public static String getFileContentsWithEncoding(String filePath, String encodin public static boolean isNodeValueInXml(String src, String searchPath, String expectedValue) throws ParserConfigurationException, SAXException, IOException, XPathExpressionException { boolean b=false; - Document mydomres =de.superx.etl.EtlUtils.parseXml(src); + Document mydomres =de.superx.elt.EtlUtils.parseXml(src); XPathFactory factory = new net.sf.saxon.xpath.XPathFactoryImpl(); XPath xPath = factory.newXPath(); diff --git a/src/de/superx/etl/QueryResultSerializer.java b/src/de/superx/elt/QueryResultSerializer.java similarity index 98% rename from src/de/superx/etl/QueryResultSerializer.java rename to src/de/superx/elt/QueryResultSerializer.java index 7d01626..d3f774e 100644 --- a/src/de/superx/etl/QueryResultSerializer.java +++ b/src/de/superx/elt/QueryResultSerializer.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.BufferedOutputStream; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -34,8 +34,8 @@ import de.superx.bin.SxJdbcClient; import java.util.Iterator; import java.util.StringTokenizer; -import de.superx.etl.bin.SxTransformer; import de.superx.common.SxResultSet; +import de.superx.elt.bin.SxTransformer; import de.superx.servlet.ServletUtils; import de.superx.servlet.SxSQL_Server; import de.superx.util.SqlStringUtils; @@ -373,7 +373,7 @@ public class QueryResultSerializer { String headZs = ""; int colNumber = this.getColnames().length; for (int i = 0; i < colNumber; i++) { - headZs += ""+NEWLINE; + headZs += " "+NEWLINE; } headZs+=""; diff --git a/src/de/superx/etl/SqlExecutor.java b/src/de/superx/elt/SqlExecutor.java similarity index 99% rename from src/de/superx/etl/SqlExecutor.java rename to src/de/superx/elt/SqlExecutor.java index d5f40e0..439d804 100644 --- a/src/de/superx/etl/SqlExecutor.java +++ b/src/de/superx/elt/SqlExecutor.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; @@ -43,9 +43,9 @@ import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import de.superx.etl.bin.SxTransformer; import de.superx.bin.XUpdater; import de.superx.common.FieldContainer; +import de.superx.elt.bin.SxTransformer; import de.superx.servlet.ServletUtils; import de.superx.servlet.SuperXManager; import de.superx.servlet.SxPools; diff --git a/src/de/superx/etl/TableUploader.java b/src/de/superx/elt/TableUploader.java similarity index 99% rename from src/de/superx/etl/TableUploader.java rename to src/de/superx/elt/TableUploader.java index cc4d7f0..5d193ac 100644 --- a/src/de/superx/etl/TableUploader.java +++ b/src/de/superx/elt/TableUploader.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl; +package de.superx.elt; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -37,7 +37,6 @@ import java.text.ParseException; import java.util.Iterator; import java.util.Properties; -import de.superx.etl.util.FileUtils; import de.superx.util.SqlStringUtils; import javax.xml.parsers.DocumentBuilder; @@ -59,6 +58,7 @@ import org.postgresql.copy.CopyManager; import de.superx.bin.SxConnection; import de.superx.bin.SxJdbcClient; import de.superx.bin.UploadRecords; +import de.superx.elt.util.FileUtils; import de.memtext.util.DateUtils; import de.memtext.util.GetOpts; import de.memtext.util.StringUtils; @@ -252,7 +252,7 @@ public class TableUploader { org.xml.sax.InputSource is; NodeList rowlist; - mydomres = de.superx.etl.EtlUtils.buildDocumentFromXmlFile(srcFile); + mydomres = de.superx.elt.EtlUtils.buildDocumentFromXmlFile(srcFile); if(xml_search_path==null) { @@ -375,7 +375,7 @@ public class TableUploader { String copySql = "COPY " + targetTable + " FROM STDIN WITH DELIMITER '" + delim + "' NULL '' ENCODING '"+ encoding+"'"; copySql += header ? " HEADER" : ""; - String srcFileContent=de.superx.etl.EtlUtils.getFileContentsWithEncoding(srcFile, encoding); + String srcFileContent=de.superx.elt.EtlUtils.getFileContentsWithEncoding(srcFile, encoding); String msg=""; try { //dbmd=uploadConnection.getMetaData(); @@ -399,7 +399,7 @@ public class TableUploader { { String srcFileIso=srcFile+"_iso.tmp"; String srcFileContentValidIso = FileUtils.convertToIso(srcFileContent,"postgres") ;//new String(srcFileContent.getBytes("ISO-8859-1")); - de.superx.etl.EtlUtils.saveFileContentsWithEncoding(srcFileIso, srcFileContentValidIso, "iso-8859-9"); + de.superx.elt.EtlUtils.saveFileContentsWithEncoding(srcFileIso, srcFileContentValidIso, "iso-8859-9"); FileInputStream fis = new FileInputStream(srcFileIso); in4 = new BufferedReader(new InputStreamReader(fis, "iso-8859-9")); diff --git a/src/de/superx/etl/bin/Doquery.java b/src/de/superx/elt/bin/Doquery.java similarity index 98% rename from src/de/superx/etl/bin/Doquery.java rename to src/de/superx/elt/bin/Doquery.java index ddd6596..a1d3e6d 100644 --- a/src/de/superx/etl/bin/Doquery.java +++ b/src/de/superx/elt/bin/Doquery.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; +package de.superx.elt.bin; import java.io.File; import java.io.FileInputStream; @@ -26,7 +26,7 @@ import java.util.StringTokenizer; import de.superx.util.SqlStringUtils; import de.superx.bin.SxConnection; import de.superx.common.SuperX_el; -import de.superx.etl.QueryResultSerializer; +import de.superx.elt.QueryResultSerializer; import de.superx.servlet.SxPools; import de.superx.servlet.SxSQL_Server; diff --git a/src/de/superx/etl/bin/Dosql.java b/src/de/superx/elt/bin/Dosql.java similarity index 95% rename from src/de/superx/etl/bin/Dosql.java rename to src/de/superx/elt/bin/Dosql.java index 3b09ca7..51720a1 100644 --- a/src/de/superx/etl/bin/Dosql.java +++ b/src/de/superx/elt/bin/Dosql.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; +package de.superx.elt.bin; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -24,11 +24,11 @@ import java.util.logging.LogManager; import java.util.logging.Logger; import de.memtext.util.ExceptionHandler; -import de.superx.etl.util.GetOpts; import de.memtext.util.PropUtils; import de.superx.bin.SxConnection; -import de.superx.etl.EtlUtils; -import de.superx.etl.SqlExecutor; +import de.superx.elt.EtlUtils; +import de.superx.elt.SqlExecutor; +import de.superx.elt.util.GetOpts; /** * @author Daniel Quathamer Projektgruppe SuperX diff --git a/src/de/superx/etl/bin/EtlJobExecutor.java b/src/de/superx/elt/bin/EtlJobExecutor.java similarity index 85% rename from src/de/superx/etl/bin/EtlJobExecutor.java rename to src/de/superx/elt/bin/EtlJobExecutor.java index 0b12bf8..796d4a8 100644 --- a/src/de/superx/etl/bin/EtlJobExecutor.java +++ b/src/de/superx/elt/bin/EtlJobExecutor.java @@ -5,13 +5,13 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; +package de.superx.elt.bin; import java.sql.Connection; -import de.superx.etl.util.GetOpts; -import de.superx.etl.EtlActionJob; -import de.superx.etl.EtlUtils; +import de.superx.elt.EtlActionJob; +import de.superx.elt.EtlUtils; +import de.superx.elt.util.GetOpts; public class EtlJobExecutor { @@ -20,7 +20,7 @@ public class EtlJobExecutor { } public static void main(String[] args) { - String usage="usage: java de.superx.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:abc -params:TID=16000 (optional) -outfile:Ausgabedatei (optional)" ; + String usage="usage: java de.superx.elt.bin.EtlJobExecutor -dbproperties:$DB_PROPERTIES -job:abc -params:TID=16000 (optional) -outfile:Ausgabedatei (optional)" ; GetOpts.setOpts(args); String isdrin = GetOpts.isAllRequiredOptionsPresent("-dbproperties,-job"); diff --git a/src/de/superx/etl/bin/SxTransformer.java b/src/de/superx/elt/bin/SxTransformer.java similarity index 99% rename from src/de/superx/etl/bin/SxTransformer.java rename to src/de/superx/elt/bin/SxTransformer.java index 58529b3..54cacd1 100644 --- a/src/de/superx/etl/bin/SxTransformer.java +++ b/src/de/superx/elt/bin/SxTransformer.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; +package de.superx.elt.bin; import java.io.BufferedWriter; import java.io.File; diff --git a/src/de/superx/etl/bin/UnloadRecords.java b/src/de/superx/elt/bin/UnloadRecords.java similarity index 99% rename from src/de/superx/etl/bin/UnloadRecords.java rename to src/de/superx/elt/bin/UnloadRecords.java index a26b1d0..fe03097 100644 --- a/src/de/superx/etl/bin/UnloadRecords.java +++ b/src/de/superx/elt/bin/UnloadRecords.java @@ -5,7 +5,7 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; +package de.superx.elt.bin; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -25,7 +25,7 @@ import java.util.StringTokenizer; import de.superx.util.SqlStringUtils; import de.superx.bin.SxConnection; import de.superx.common.SuperX_el; -import de.superx.etl.QueryResultSerializer; +import de.superx.elt.QueryResultSerializer; import de.superx.servlet.SxPools; import de.superx.servlet.SxSQL_Server; diff --git a/src/de/superx/etl/bin/UploadRecords.java b/src/de/superx/elt/bin/UploadRecords.java similarity index 95% rename from src/de/superx/etl/bin/UploadRecords.java rename to src/de/superx/elt/bin/UploadRecords.java index 8570c2d..61eb385 100644 --- a/src/de/superx/etl/bin/UploadRecords.java +++ b/src/de/superx/elt/bin/UploadRecords.java @@ -5,9 +5,9 @@ * This package is licensed under the CampusSource License; * http://www.campussource.de/org/license/ */ -package de.superx.etl.bin; -import de.superx.etl.util.GetOpts; -import de.superx.etl.TableUploader; +package de.superx.elt.bin; +import de.superx.elt.TableUploader; +import de.superx.elt.util.GetOpts; /* * @author Daniel Quathamer Projektgruppe SuperX diff --git a/src/de/superx/etl/util/FileUtils.java b/src/de/superx/elt/util/FileUtils.java similarity index 99% rename from src/de/superx/etl/util/FileUtils.java rename to src/de/superx/elt/util/FileUtils.java index 0fd94b7..69cbfe1 100644 --- a/src/de/superx/etl/util/FileUtils.java +++ b/src/de/superx/elt/util/FileUtils.java @@ -1,4 +1,4 @@ -package de.superx.etl.util; +package de.superx.elt.util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/de/superx/etl/util/GetOpts.java b/src/de/superx/elt/util/GetOpts.java similarity index 99% rename from src/de/superx/etl/util/GetOpts.java rename to src/de/superx/elt/util/GetOpts.java index 1db8737..51bc0b4 100644 --- a/src/de/superx/etl/util/GetOpts.java +++ b/src/de/superx/elt/util/GetOpts.java @@ -1,4 +1,4 @@ -package de.superx.etl.util; +package de.superx.elt.util; import java.util.StringTokenizer; diff --git a/src/de/superx/etl/util/GetOptsBackport.java b/src/de/superx/elt/util/GetOptsBackport.java similarity index 99% rename from src/de/superx/etl/util/GetOptsBackport.java rename to src/de/superx/elt/util/GetOptsBackport.java index dea4d8e..4a68d15 100644 --- a/src/de/superx/etl/util/GetOptsBackport.java +++ b/src/de/superx/elt/util/GetOptsBackport.java @@ -1,4 +1,4 @@ -package de.superx.etl.util; +package de.superx.elt.util; /** * Class to analyze arguments passed to Java class diff --git a/src/de/superx/sxrest/JobExecutor.java b/src/de/superx/sxrest/JobExecutor.java index 3eb3b33..2b10008 100644 --- a/src/de/superx/sxrest/JobExecutor.java +++ b/src/de/superx/sxrest/JobExecutor.java @@ -13,7 +13,7 @@ import java.sql.SQLException; import javax.servlet.http.HttpServletRequest; import de.memtext.util.DateUtils; import de.superx.common.SxUser; -import de.superx.etl.EtlActionJob; +import de.superx.elt.EtlActionJob; import de.superx.servlet.SuperXManager; @Path("/execute") diff --git a/src/de/superx/sxrest/LaunchUpgrade.java b/src/de/superx/sxrest/LaunchUpgrade.java index b504b72..be3dd5d 100644 --- a/src/de/superx/sxrest/LaunchUpgrade.java +++ b/src/de/superx/sxrest/LaunchUpgrade.java @@ -15,8 +15,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import de.memtext.util.DateUtils; import de.superx.common.SxUser; -import de.superx.etl.EtlActionJob; -import de.superx.etl.EtlUtils; +import de.superx.elt.EtlActionJob; +import de.superx.elt.EtlUtils; import de.superx.servlet.SuperXManager; import javax.servlet.http.HttpServletRequest; diff --git a/src/de/superx/sxrest/MaskXml.java b/src/de/superx/sxrest/MaskXml.java index edfe164..d8018e7 100644 --- a/src/de/superx/sxrest/MaskXml.java +++ b/src/de/superx/sxrest/MaskXml.java @@ -35,8 +35,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import de.memtext.util.DateUtils; import de.superx.common.SxUser; -import de.superx.etl.EtlActionJob; -import de.superx.etl.EtlUtils; +import de.superx.elt.EtlActionJob; +import de.superx.elt.EtlUtils; import de.superx.servlet.SuperXManager; import java.io.BufferedWriter; @@ -55,12 +55,18 @@ public class MaskXml { @GET @Path("/get/{param}") - @Produces(MediaType.TEXT_PLAIN) + @Produces(MediaType.APPLICATION_XML) - public String printXml(@PathParam("param") String tid,@Context HttpServletRequest request) { + public Document printXml(@PathParam("param") String tid,@Context HttpServletRequest request) { String returntext=""; - SxUser user = (SxUser) request.getSession().getAttribute("user"); + returntext = getMaskXml(tid, request); + + return de.memtext.util.XMLUtils.buildDocumentFromString(returntext, false); + } + private String getMaskXml(String tid, HttpServletRequest request) { + String returntext; + SxUser user = (SxUser) request.getSession().getAttribute("user"); String mandantenid= (String) request.getSession().getAttribute("MandantenID"); if(mandantenid==null || mandantenid.equals("")) mandantenid="default"; @@ -94,9 +100,18 @@ public class MaskXml { returntext+=myJob.getLogoutput(); } } - - return returntext; + return returntext; + } + @GET + @Path("/download/{param}") + @Produces(MediaType.APPLICATION_XML) + public String createDownloadXml(@PathParam("param") String tid,@Context HttpServletRequest request) { + String returntext=""; + returntext = getMaskXml(tid, request); + return returntext; + //return de.memtext.util.XMLUtils.buildDocumentFromString(returntext, false); } + /* Aktuell noch nicht genutzt: */ @GET @Path("/saveget/{params}") @Produces(MediaType.TEXT_PLAIN) @@ -121,6 +136,7 @@ public class MaskXml { return returntext; } + /* Aktuell noch nicht genutzt: */ @POST @Path("/save") @Consumes("application/x-www-form-urlencoded") @@ -146,7 +162,7 @@ public class MaskXml { else { try { - if(de.superx.etl.EtlUtils.isNodeValueInXml(src,searchString,tid)) + if(de.superx.elt.EtlUtils.isNodeValueInXml(src,searchString,tid)) { String job="sx_insert_mask"; returntext="TID="+tid; diff --git a/superx/WEB-INF/lib/superx-etl.jar b/superx/WEB-INF/lib/superx-etl.jar index de0975e..c9d26a9 100644 Binary files a/superx/WEB-INF/lib/superx-etl.jar and b/superx/WEB-INF/lib/superx-etl.jar differ diff --git a/superx/edit/etl/etl_manager.jsp b/superx/edit/etl/etl_manager.jsp index 8d53997..f0188a4 100644 --- a/superx/edit/etl/etl_manager.jsp +++ b/superx/edit/etl/etl_manager.jsp @@ -11,6 +11,7 @@ ETL Manager +