SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

report name of xml file in case of format error (#2626)

Browse Source 
* report name of xml file in case of format error

In case of an error in the XML file, for support reason I want to know which file causes the error. The file name is mentioned if the XML itself is corrupt or if there is an XML version mismatch.
This PR fixes issue #2619.

* fix abaplint issues

fix abaplint issues
This commit is contained in:
Martin Fuchs 2019-04-14 09:14:22 +02:00 committed by Lars Hvam
parent 272925fff7
commit 6560cbe539
4 changed files with 94 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/objects/zcl_abapgit_objects_files.clas.abap
View File

@ -200,6 +200,25 @@ CLASS ZCL_ABAPGIT_OBJECTS_FILES IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD contains.
DATA: lv_filename TYPE string.
lv_filename = filename( iv_extra = iv_extra
iv_ext = iv_ext ).
IF mv_path IS NOT INITIAL.
READ TABLE mt_files TRANSPORTING NO FIELDS WITH KEY path = mv_path
filename = lv_filename.
ELSE.
READ TABLE mt_files TRANSPORTING NO FIELDS WITH KEY filename = lv_filename.
ENDIF.
IF sy-subrc = 0.
rv_present = abap_true.
ENDIF.
ENDMETHOD.
METHOD filename. METHOD filename.
DATA: lv_obj_name TYPE string. DATA: lv_obj_name TYPE string.
@ -343,7 +362,8 @@ CLASS ZCL_ABAPGIT_OBJECTS_FILES IMPLEMENTATION.
CREATE OBJECT ro_xml CREATE OBJECT ro_xml
EXPORTING EXPORTING
iv_xml = lv_xml. iv_xml = lv_xml
iv_filename = lv_filename.
ENDMETHOD. ENDMETHOD.
@ -351,23 +371,4 @@ CLASS ZCL_ABAPGIT_OBJECTS_FILES IMPLEMENTATION.
METHOD set_files. METHOD set_files.
mt_files = it_files. mt_files = it_files.
ENDMETHOD. ENDMETHOD.
METHOD contains.
DATA: lv_filename TYPE string.
lv_filename = filename( iv_extra = iv_extra
iv_ext = iv_ext ).
IF mv_path IS NOT INITIAL.
READ TABLE mt_files TRANSPORTING NO FIELDS WITH KEY path = mv_path
filename = lv_filename.
ELSE.
READ TABLE mt_files TRANSPORTING NO FIELDS WITH KEY filename = lv_filename.
ENDIF.
IF sy-subrc = 0.
rv_present = abap_true.
ENDIF.
ENDMETHOD.
ENDCLASS. ENDCLASS.

93
src/xml/zcl_abapgit_xml.clas.abap
View File

@ -5,12 +5,14 @@ CLASS zcl_abapgit_xml DEFINITION
PUBLIC SECTION. PUBLIC SECTION.
METHODS: METHODS:
constructor. constructor
IMPORTING iv_filename TYPE string OPTIONAL.
PROTECTED SECTION. PROTECTED SECTION.
DATA: mi_ixml TYPE REF TO if_ixml, DATA: mi_ixml TYPE REF TO if_ixml,
mi_xml_doc TYPE REF TO if_ixml_document, mi_xml_doc TYPE REF TO if_ixml_document,
ms_metadata TYPE zif_abapgit_definitions=>ty_metadata. ms_metadata TYPE if_abapgit_definitions=>ty_metadata,
mv_filename TYPE string.
CONSTANTS: c_abapgit_tag TYPE string VALUE 'abapGit' ##NO_TEXT, CONSTANTS: c_abapgit_tag TYPE string VALUE 'abapGit' ##NO_TEXT,
c_attr_version TYPE string VALUE 'version' ##NO_TEXT, c_attr_version TYPE string VALUE 'version' ##NO_TEXT,
@ -27,12 +29,12 @@ CLASS zcl_abapgit_xml DEFINITION
RAISING zcx_abapgit_exception. RAISING zcx_abapgit_exception.
PRIVATE SECTION. PRIVATE SECTION.
METHODS error METHODS error
IMPORTING ii_parser TYPE REF TO if_ixml_parser IMPORTING ii_parser TYPE REF TO if_ixml_parser
RAISING zcx_abapgit_exception. RAISING zcx_abapgit_exception.
METHODS display_version_mismatch
METHODS display_xml_error RAISING zcx_abapgit_exception.
RAISING zcx_abapgit_exception.
ENDCLASS. ENDCLASS.
@ -42,62 +44,91 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
METHOD constructor. METHOD constructor.
mi_ixml = cl_ixml=>create( ). mi_ixml = cl_ixml=>create( ).
mi_xml_doc = mi_ixml->create_document( ). mi_xml_doc = mi_ixml->create_document( ).
mv_filename = iv_filename.
ENDMETHOD. ENDMETHOD.
METHOD display_xml_error. METHOD display_version_mismatch.
DATA: lv_version TYPE string. DATA: lv_version TYPE string.
DATA: lv_file TYPE string.
lv_version = |abapGit version: { zif_abapgit_version=>gc_abap_version }|. "#EC NOTEXT
lv_version = |abapGit version: { zif_abapgit_version=>gc_abap_version }|. IF mv_filename IS NOT INITIAL.
lv_file = |File: { mv_filename }|. "#EC NOTEXT
ENDIF.
CALL FUNCTION 'POPUP_TO_INFORM' CALL FUNCTION 'POPUP_TO_INFORM'
EXPORTING EXPORTING
titel = 'abapGit XML version mismatch' titel = 'abapGit XML version mismatch' "#EC NOTEXT
txt1 = 'abapGit XML version mismatch' txt1 = 'abapGit XML version mismatch' "#EC NOTEXT
txt2 = 'See http://larshp.github.io/abapGit/other-xml-mismatch.html' txt2 = 'See http://larshp.github.io/abapGit/other-xml-mismatch.html' "#EC NOTEXT
txt3 = lv_version. "#EC NOTEXT txt3 = lv_version
txt4 = lv_file.
zcx_abapgit_exception=>raise( 'XML error' ). IF mv_filename IS INITIAL.
zcx_abapgit_exception=>raise( 'abapGit XML version mismatch' ). "#EC NOTEXT
ELSE.
zcx_abapgit_exception=>raise( |abapGit XML version mismatch in file { mv_filename }| ). "#EC NOTEXT
ENDIF.
ENDMETHOD. ENDMETHOD.
METHOD error. METHOD error.
DATA: lv_error TYPE i, DATA: lv_error TYPE i,
lv_txt1 TYPE string, lv_column TYPE string,
lv_txt2 TYPE string, lv_line TYPE string,
lv_txt3 TYPE string, lv_reason TYPE string,
lv_times TYPE i, lv_txt1 TYPE string,
li_error TYPE REF TO if_ixml_parse_error. lv_txt2 TYPE string,
lv_txt3 TYPE string,
lv_txt4 TYPE string,
lv_times TYPE i,
li_error TYPE REF TO if_ixml_parse_error.
IF ii_parser->num_errors( ) <> 0. IF ii_parser->num_errors( ) <> 0.
lv_times = ii_parser->num_errors( ). lv_times = ii_parser->num_errors( ).
DO lv_times TIMES. DO lv_times TIMES.
lv_error = sy-index - 1. lv_error = sy-index - 1.
li_error = ii_parser->get_error( lv_error ). li_error = ii_parser->get_error( lv_error ).
lv_txt1 = li_error->get_column( ). lv_column = li_error->get_column( ).
CONCATENATE 'Column:' lv_txt1 INTO lv_txt1. "#EC NOTEXT lv_line = li_error->get_line( ).
lv_txt2 = li_error->get_line( ). lv_reason = li_error->get_reason( ).
CONCATENATE 'Line:' lv_txt2 INTO lv_txt2. "#EC NOTEXT
lv_txt3 = li_error->get_reason( ). IF mv_filename IS NOT INITIAL.
lv_txt1 = |File: { mv_filename }|. "#EC NOTEXT
lv_txt2 = |Column: { lv_column }|. "#EC NOTEXT
lv_txt3 = |Line: { lv_line }|. "#EC NOTEXT
lv_txt4 = lv_reason.
ELSE.
lv_txt1 = |Column: { lv_column }|. "#EC NOTEXT
lv_txt2 = |Line: { lv_line }|. "#EC NOTEXT
lv_txt3 = lv_reason.
CLEAR lv_txt4.
ENDIF.
CALL FUNCTION 'POPUP_TO_INFORM' CALL FUNCTION 'POPUP_TO_INFORM'
EXPORTING EXPORTING
titel = 'Error from XML parser' "#EC NOTEXT titel = |Error from XML parser| "#EC NOTEXT
txt1 = lv_txt1 txt1 = lv_txt1
txt2 = lv_txt2 txt2 = lv_txt2
txt3 = lv_txt3. txt3 = lv_txt3
txt4 = lv_txt4.
ENDDO. ENDDO.
ENDIF. ENDIF.
zcx_abapgit_exception=>raise( 'Error while parsing XML' ). IF mv_filename IS INITIAL.
zcx_abapgit_exception=>raise( |Error while parsing XML| ). "#EC NOTEXT
ELSE.
zcx_abapgit_exception=>raise( |Error while parsing XML file { mv_filename }| ). "#EC NOTEXT
ENDIF.
ENDMETHOD. ENDMETHOD.
@ -129,7 +160,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
li_version = li_element->if_ixml_node~get_attributes( li_version = li_element->if_ixml_node~get_attributes(
)->get_named_item_ns( c_attr_version ) ##no_text. )->get_named_item_ns( c_attr_version ) ##no_text.
IF li_version->get_value( ) <> zif_abapgit_version=>gc_xml_version. IF li_version->get_value( ) <> zif_abapgit_version=>gc_xml_version.
display_xml_error( ). display_version_mismatch( ).
ENDIF. ENDIF.
* buffer serializer metadata. Git node will be removed lateron * buffer serializer metadata. Git node will be removed lateron

12
src/xml/zcl_abapgit_xml_input.clas.abap
View File

@ -7,7 +7,8 @@ CLASS zcl_abapgit_xml_input DEFINITION
METHODS constructor METHODS constructor
IMPORTING IMPORTING
!iv_xml TYPE clike !iv_xml TYPE clike
!iv_filename TYPE string OPTIONAL
RAISING RAISING
zcx_abapgit_exception . zcx_abapgit_exception .
METHODS read METHODS read
@ -24,6 +25,7 @@ CLASS zcl_abapgit_xml_input DEFINITION
METHODS get_metadata METHODS get_metadata
RETURNING RETURNING
VALUE(rs_metadata) TYPE zif_abapgit_definitions=>ty_metadata . VALUE(rs_metadata) TYPE zif_abapgit_definitions=>ty_metadata .
PRIVATE SECTION. PRIVATE SECTION.
METHODS: fix_xml. METHODS: fix_xml.
@ -36,7 +38,7 @@ CLASS ZCL_ABAPGIT_XML_INPUT IMPLEMENTATION.
METHOD constructor. METHOD constructor.
super->constructor( ). super->constructor( iv_filename ).
parse( iv_xml ). parse( iv_xml ).
fix_xml( ). fix_xml( ).
@ -89,7 +91,11 @@ CLASS ZCL_ABAPGIT_XML_INPUT IMPLEMENTATION.
SOURCE XML mi_xml_doc SOURCE XML mi_xml_doc
RESULT (lt_rtab) ##no_text. RESULT (lt_rtab) ##no_text.
CATCH cx_transformation_error INTO lx_error. CATCH cx_transformation_error INTO lx_error.
zcx_abapgit_exception=>raise( lx_error->if_message~get_text( ) ). IF mv_filename IS INITIAL.
zcx_abapgit_exception=>raise( lx_error->if_message~get_text( ) ).
ELSE.
zcx_abapgit_exception=>raise( |File { mv_filename }: { lx_error->if_message~get_text( ) }| ).
ENDIF.
ENDTRY. ENDTRY.
ENDMETHOD. ENDMETHOD.

3
src/zcl_abapgit_objects.clas.abap
View File

@ -362,7 +362,8 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
CREATE OBJECT lo_remote_version CREATE OBJECT lo_remote_version
EXPORTING EXPORTING
iv_xml = zcl_abapgit_convert=>xstring_to_string_utf8( ls_remote_file-data ). iv_xml = zcl_abapgit_convert=>xstring_to_string_utf8( ls_remote_file-data )
iv_filename = ls_remote_file-filename.
ls_result = li_comparator->compare( lo_remote_version ). ls_result = li_comparator->compare( lo_remote_version ).
IF ls_result-text IS INITIAL. IF ls_result-text IS INITIAL.