mirror of
https://github.com/abap2xlsx/abap2xlsx.git
synced 2025-05-04 20:28:22 +08:00
Fix unescape string value when not escpaped (#1160)
* BUGFIX: Skip Input without escaped Character Some special Values, e.g. "TEST_X" were handled like it was an escaped Character, thats because it was not checked if the second conition, an "_" behind it was there * Adjust Package Description to its Original * Remove commented Code Was there for testing, not needed anymore * Downport to 7.02 Adjust Method Call to apply 7.02 Syntax * Fix abaplint Issues * Fix abaplint Issues (again) --------- Fix #1122 Co-authored-by: sandraros <34005250+sandraros@users.noreply.github.com>
This commit is contained in:
HuprichTo
GitHub
parent
76a39a7819
commit
92809a41e3
|
|
@ -306,7 +306,12 @@ CLASS zcl_excel_reader_2007 DEFINITION
|
|||
iv_path TYPE string
|
||||
!ip_excel TYPE REF TO zcl_excel
|
||||
RAISING
|
||||
zcx_excel .
|
||||
zcx_excel.
|
||||
METHODS provided_string_is_escaped
|
||||
IMPORTING
|
||||
!value TYPE string
|
||||
RETURNING
|
||||
VALUE(is_escaped) TYPE abap_bool.
|
||||
|
||||
CONSTANTS: BEGIN OF namespace,
|
||||
x14ac TYPE string VALUE 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
|
||||
|
|
@ -4280,17 +4285,21 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
|
|||
|
||||
METHOD unescape_string_value.
|
||||
|
||||
DATA: lt_character_positions TYPE TABLE OF i,
|
||||
lv_character_position TYPE i,
|
||||
lv_character_position_plus_2 TYPE i,
|
||||
lv_character_position_plus_6 TYPE i,
|
||||
lv_unescaped_value TYPE string.
|
||||
DATA:
|
||||
"Marks the Position before the searched Pattern occurs in the String
|
||||
"For example in String A_X_TEST_X, the Table is filled with 1 and 8
|
||||
lt_character_positions TYPE TABLE OF i,
|
||||
lv_character_position TYPE i,
|
||||
lv_character_position_plus_2 TYPE i,
|
||||
lv_character_position_plus_6 TYPE i,
|
||||
lv_unescaped_value TYPE string.
|
||||
|
||||
" The text "_x...._", with "_x" not "_X", with exactly 4 ".", each being 0-9 a-f or A-F (case insensitive), is interpreted
|
||||
" like Unicode character U+.... (e.g. "_x0041_" is rendered like "A") is for characters.
|
||||
" The text "_x...._", with "_x" not "_X". Each "." represents one character, being 0-9 a-f or A-F (case insensitive),
|
||||
" is interpreted like Unicode character U+.... (e.g. "_x0041_" is rendered like "A") is for characters.
|
||||
" To not interpret it, Excel replaces the first "_" with "_x005f_".
|
||||
result = i_value.
|
||||
IF result CS '_x'.
|
||||
|
||||
IF provided_string_is_escaped( i_value ) = abap_true.
|
||||
CLEAR lt_character_positions.
|
||||
APPEND sy-fdpos TO lt_character_positions.
|
||||
lv_character_position = sy-fdpos + 1.
|
||||
|
|
@ -4303,10 +4312,11 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
|
|||
LOOP AT lt_character_positions INTO lv_character_position.
|
||||
lv_character_position_plus_2 = lv_character_position + 2.
|
||||
lv_character_position_plus_6 = lv_character_position + 6.
|
||||
IF substring( val = result off = lv_character_position_plus_2 len = 4 ) CO '0123456789ABCDEFGHIJKLMNOPQRSTUVWabcdefghijklmnopqrstuvw'
|
||||
AND substring( val = result off = lv_character_position_plus_6 len = 1 ) = '_'.
|
||||
lv_unescaped_value = cl_abap_conv_in_ce=>uccp( to_upper( substring( val = result off = lv_character_position_plus_2 len = 4 ) ) ).
|
||||
REPLACE SECTION OFFSET lv_character_position LENGTH 7 OF result WITH lv_unescaped_value.
|
||||
IF substring( val = result off = lv_character_position_plus_2 len = 4 ) CO '0123456789ABCDEFabcdef'.
|
||||
IF substring( val = result off = lv_character_position_plus_6 len = 1 ) = '_'.
|
||||
lv_unescaped_value = cl_abap_conv_in_ce=>uccp( to_upper( substring( val = result off = lv_character_position_plus_2 len = 4 ) ) ).
|
||||
REPLACE SECTION OFFSET lv_character_position LENGTH 7 OF result WITH lv_unescaped_value.
|
||||
ENDIF.
|
||||
ENDIF.
|
||||
ENDLOOP.
|
||||
ENDIF.
|
||||
|
|
@ -4429,4 +4439,19 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
|
|||
iv_zcl_excel_classname = iv_zcl_excel_classname ).
|
||||
|
||||
ENDMETHOD.
|
||||
METHOD provided_string_is_escaped.
|
||||
|
||||
"Check if passed value is really an escaped Character
|
||||
IF value CS '_x'.
|
||||
is_escaped = abap_true.
|
||||
TRY.
|
||||
IF substring( val = value off = sy-fdpos + 6 len = 1 ) <> '_'.
|
||||
is_escaped = abap_false.
|
||||
ENDIF.
|
||||
CATCH cx_sy_range_out_of_bounds.
|
||||
is_escaped = abap_false.
|
||||
ENDTRY.
|
||||
ENDIF.
|
||||
ENDMETHOD.
|
||||
|
||||
ENDCLASS.
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ CLASS ltc_unescape_string_value DEFINITION
|
|||
METHODS no_escaping FOR TESTING.
|
||||
METHODS one_escaped_character FOR TESTING.
|
||||
METHODS two_escaped_characters FOR TESTING.
|
||||
METHODS skip_when_not_escaped FOR TESTING RAISING cx_static_check.
|
||||
|
||||
METHODS run_cut
|
||||
IMPORTING
|
||||
|
|
@ -52,4 +53,18 @@ CLASS ltc_unescape_string_value IMPLEMENTATION.
|
|||
run_cut( input = '_x0000_ and _xFFFF_' exp = |{ cl_abap_conv_in_ce=>uccp( '0000' ) } and { cl_abap_conv_in_ce=>uccp( 'FFFF' ) }| ).
|
||||
ENDMETHOD.
|
||||
|
||||
METHOD skip_when_not_escaped.
|
||||
DATA: lo_excel TYPE REF TO zcl_excel_reader_2007,
|
||||
value TYPE string VALUE 'TEST_X'.
|
||||
|
||||
CREATE OBJECT lo_excel.
|
||||
|
||||
"Method is used to check for "_x", but its not an escaped charcater, output should input.
|
||||
lo_excel->unescape_string_value( i_value = value ).
|
||||
|
||||
cl_abap_unit_assert=>assert_equals(
|
||||
exp = value
|
||||
act = value ).
|
||||
ENDMETHOD.
|
||||
|
||||
ENDCLASS.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user