unprettify XML before save, close #556

This commit is contained in:
sbcgua 2017-01-30 16:51:35 +02:00
parent dfadb53c97
commit 15249221a6
3 changed files with 24 additions and 22 deletions

View File

@ -45,8 +45,7 @@ CLASS lcl_gui_page_db_display IMPLEMENTATION.
ls_action-type = ms_key-type. ls_action-type = ms_key-type.
ls_action-value = ms_key-value. ls_action-value = ms_key-value.
lv_action = lcl_html_action_utils=>dbkey_encode( ls_action ). lv_action = lcl_html_action_utils=>dbkey_encode( ls_action ).
lv_data = lcl_xml_pretty=>print( lv_data ). lv_data = lo_highlighter->process_line( lcl_xml_pretty=>print( lv_data ) ).
lv_data = lo_highlighter->process_line( lv_data ).
CREATE OBJECT ro_html. CREATE OBJECT ro_html.
@ -107,9 +106,7 @@ CLASS lcl_gui_page_db_edit IMPLEMENTATION.
iv_type = ms_key-type iv_type = ms_key-type
iv_value = ms_key-value ). iv_value = ms_key-value ).
lv_data = lcl_xml_pretty=>print( lv_data ). lv_data = escape( val = lcl_xml_pretty=>print( lv_data )
lv_data = escape( val = lv_data
format = cl_abap_format=>e_html_attr ). format = cl_abap_format=>e_html_attr ).
CREATE OBJECT ro_html. CREATE OBJECT ro_html.

View File

@ -81,8 +81,9 @@ CLASS lcl_persistence_db DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app.
RAISING lcx_exception. RAISING lcx_exception.
PRIVATE SECTION. PRIVATE SECTION.
METHODS: validate_xml METHODS: validate_and_unprettify_xml
IMPORTING iv_xml TYPE string IMPORTING iv_xml TYPE string
RETURNING VALUE(rv_xml) TYPE string
RAISING lcx_exception. RAISING lcx_exception.
ENDCLASS. ENDCLASS.
@ -831,29 +832,32 @@ CLASS lcl_persistence_db IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD validate_xml. METHOD validate_and_unprettify_xml.
lcl_xml_pretty=>print( rv_xml = lcl_xml_pretty=>print(
iv_xml = iv_xml iv_xml = iv_xml
iv_unpretty = abap_true
iv_ignore_errors = abap_false ). iv_ignore_errors = abap_false ).
ENDMETHOD. ENDMETHOD. " validate_and_unprettify_xml
METHOD update. METHOD update.
validate_xml( iv_data ). DATA lv_data LIKE iv_data.
lv_data = validate_and_unprettify_xml( iv_data ).
lock( iv_type = iv_type lock( iv_type = iv_type
iv_value = iv_value ). iv_value = iv_value ).
UPDATE (c_tabname) SET data_str = iv_data UPDATE (c_tabname) SET data_str = lv_data
WHERE type = iv_type WHERE type = iv_type
AND value = iv_value. AND value = iv_value.
IF sy-subrc <> 0. IF sy-subrc <> 0.
lcx_exception=>raise( 'DB update failed' ). lcx_exception=>raise( 'DB update failed' ).
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD. "update
METHOD modify. METHOD modify.

View File

@ -358,6 +358,7 @@ CLASS lcl_xml_pretty DEFINITION FINAL.
CLASS-METHODS: print CLASS-METHODS: print
IMPORTING iv_xml TYPE string IMPORTING iv_xml TYPE string
iv_ignore_errors TYPE abap_bool DEFAULT abap_true iv_ignore_errors TYPE abap_bool DEFAULT abap_true
iv_unpretty TYPE abap_bool DEFAULT abap_false
RETURNING VALUE(rv_xml) TYPE string RETURNING VALUE(rv_xml) TYPE string
RAISING lcx_exception. RAISING lcx_exception.
@ -403,7 +404,7 @@ CLASS lcl_xml_pretty IMPLEMENTATION.
li_renderer = li_ixml->create_renderer( ostream = li_ostream li_renderer = li_ixml->create_renderer( ostream = li_ostream
document = li_xml_doc ). document = li_xml_doc ).
li_renderer->set_normalizing( abap_true ). li_renderer->set_normalizing( boolc( iv_unpretty = abap_false ) ).
li_renderer->render( ). li_renderer->render( ).