JP2019133534A - Merging method, merging device, and merging program - Google Patents

Abstract

To appropriately merge a plurality of documents generated by mutually different updates.SOLUTION: A merging method of the present invention is executed by a merging device and includes a difference acquisition process and a merge process. With respect to a first and a second structured document generated by separate updates on a structured document, the difference acquisition process acquires first difference information indicating a difference between the first structured document and the structured document and second difference information indicating a difference between the second structured document and the structured document. The merge process determines the order of application of first changed statement data included in the first difference information and second changed statement data included in the second difference information, and when applying the first changed statement data to the structured document on the basis of the order of application, applies the second changed statement data having second phrase data belonging to a second hierarchy equal to a first hierarchy as applicable, to the structured document as well, and merges the first and the second structured documents.SELECTED DRAWING: Figure 1

Description

  The present invention relates to a merging method, a merging apparatus, and a merging program.

  Conventionally, in software development using a data description language or the like, a plurality of developers may advance development while sharing data. At this time, the structured document described in the data description language or the like may be updated differently. In this case, a merge process of a plurality of structured documents after update may be performed.

JP2013-65181A JP 2006-163912 A JP 2004-46745 A

  There is a possibility that updates that conflict with each other may be performed on shared data that is a structured document. When a plurality of structured documents that have been updated in conflict with each other are merged, the structure of the merged structured document may be destroyed. If the structure of the structured document after merging is destroyed, an inappropriate merging result will be output.

  Further, when the merge processing of each of the plurality of structured documents after update is performed, an inappropriate merge result is output depending on the execution order of instructions for executing each update.

  An object according to one aspect of the present invention is to appropriately merge a plurality of structured documents generated by different updates.

  The merging method of one aspect of the present invention is executed by a merging device and includes a difference acquisition process and a merging process. The difference acquisition process includes a first difference indicating a difference between the first structured document and the structured document with respect to the first structured document and the second structured document generated by separate updates to the structured document. Information and second difference information indicating a difference between the second structured document and the structured document are acquired. In the merging process, the application order of the first change statement data and the second change statement data is determined. The application order includes the first hierarchy in the structured document of the first phrase data to be applied to the first change sentence data included in the first difference information, and the second change sentence data included in the second difference information. Is determined based on the depth of each of the second hierarchies in the structured document of the second phrase data to be applied. The merging unit applies the second phrase data belonging to the second hierarchy equal to the first hierarchy to the application target when applying the first change sentence data to the structured document based on the application order. The changed sentence data is also applied to the structured document, and the first structured document and the second structured document are merged.

  According to the above aspect, a plurality of structured documents generated by different updates can be appropriately merged.

It is a figure which illustrates the functional block of the merge apparatus which concerns on this embodiment. It is a figure which illustrates change text data extracted from change history about change of document data and change of document data. It is a figure which illustrates the document data and change sentence data which were changed by application of change sentence data. It is a figure which illustrates the document data changed by application of change sentence data. It is a figure for demonstrating an example about aggregation. It is a figure which illustrates the processing content of the merge part in the case of applying the two change sentence data which obtain mutually different update results to one word data. It is a figure which illustrates the processing method of the merge part in case there is only one change command which changes one word data. It is a figure which illustrates the display content by the input-output part according to the display instruction from a selection part. It is a figure which illustrates the flow of the process by the merge apparatus which concerns on this embodiment until the merge process by a merge part is performed. FIG. 11 is a diagram (No. 1) for specifically explaining a difference information extraction process when there are two change commands. FIG. 10 is a diagram (No. 2) for specifically explaining differential information extraction processing when there are two change commands. FIG. 14 is a diagram (No. 3) for specifically explaining the difference information extraction processing when there are two change instructions. It is a figure which shows an example of the processing content by a sort part. It is a figure which illustrates the detail of the process by an aggregation part. It is a figure which illustrates a part of flow of pre-processing. It is a flowchart which illustrates the detail about the process by an aggregation part. It is a figure which shows the specific example of the change sentence data before and behind execution of the preprocessing by an aggregation part. It is a flowchart which illustrates the detail of an aggregation process. It is a figure for demonstrating concretely an aggregation process. It is a flowchart which illustrates the detail of post-processing. It is a figure which illustrates the flow of the process by a merge part. It is a figure (the 1) which illustrates the processing method by a merge part. It is FIG. (The 2) which illustrates the processing method by a merge part. It is FIG. (The 3) which illustrates the processing method by a merge part. It is FIG. (The 4) which illustrates the processing method by a merge part. It is a figure which illustrates the hardware constitutions of the merge apparatus which concerns on this embodiment.

  FIG. 1 shows an example of functional blocks of the merging apparatus 1 according to the present embodiment. The merging device 1 may be a predetermined computer, for example. The merging device 1 may be a mockup server that performs a test in software development, for example.

  The merging apparatus 1 includes a storage unit 10, an input / output unit 11, a difference acquisition unit 12, an aggregation unit 13, a sorting unit 14, a source acquisition unit 15, a merging unit 16, a selection unit 17, and the like.

  The storage unit 10 stores structured document data (also referred to as document data) such as JSON (Java Script Object Notation, “Java Script” is a registered trademark). The document data in this embodiment includes words such as nouns, data such as compound words and phrases (also referred to as phrase data) arranged based on a nested structure. In addition to the nested structure, the document data may include word data arranged based on a tree structure or the like. The document data can be changed via the input / output unit 11 described later. The storage unit 10 stores document data before the change, and stores data such as a change instruction for changing the document data after the change, data relating to the difference between the document data before and after the change, and document data. Hereinafter, data related to the difference between the document data before and after the change, a change command for changing the document data, and the like may be described as change history data below.

  The input / output unit 11 accepts input of document data from a user such as a developer, a change command for changing document data, an instruction to merge two or more document data, and the like. Although one input / output unit 11 is shown in FIG. 1, the merging apparatus 1 includes a plurality of input / output units 11 in order to accept document data change commands from a plurality of users. May be. The input / output unit 11 may accept a plurality of change commands through an account given to each of a plurality of users. The merging device 1 may accept a change command input by a user in another device via a communication unit (not shown). The memory | storage part 10 memorize | stores the data which concern on the change command from a some user or apparatus for every user, every account, or every apparatus.

  The input / output unit 11 may output the processing results obtained by the merging unit 16 and the selection unit 17 to a display device such as a display, for example, and cause the display device to display the processing results.

  When receiving the merge instruction via the input / output unit 11, the difference acquisition unit 12 reads the change history data stored in the storage unit 10. The difference acquisition unit 12 is data relating to a difference between the document data before and after the change from the change history data, and belonging information indicating which word data is subordinate to the word data to be changed in the nested structure; Extract each phrase data before and after the change. Hereinafter, this data is also referred to as change sentence data. The affiliation information is information (path) such as a character string for indicating up to the position where the data exists. The changed sentence data in the present embodiment is used when changing the word data before the change at the location indicated by the affiliation information to the word data after the change.

  Data including change sentence data and data for changing the entire document is also referred to as difference information. In the present embodiment, one difference information is generated for one change command.

  When the total number of difference information is N (N is a natural number of 2 or more), each difference information may be described as nth difference information (n is a natural number of 1 or more and N or less). Assume that the change statement data included in the nth difference information may be written as the nth change statement data. Assume that the phrase data to which the nth modified sentence data is applied is sometimes referred to as the nth phrase data. Assume that the structured document generated by applying the nth difference information to the document data may be described as the nth structured document.

  FIG. 2 exemplifies change target document data and change sentence data extracted from change history data regarding the change of the document data. FIG. 2 shows document data by JSON as an example, but the document data is not limited to that by JSON. The JSON includes “name” data (also described as name data) and “value” data (also described as value data). Name data and value data are examples of phrase data.

  In the example shown in FIG. 2, “books” and “book” are name data, and “a”, “b”, and “c” are value data. “Book” is data belonging to “books”, and “a”, “b”, and “c” are specific examples of “book”. For example, proper nouns “a”, “b”, and “c” that are book titles are associated with the general noun “book” (book). The value data is associated with name data representing the general concept using, for example, “:”, and is sequentially shown adjacent to “:”. Since these value data “a” and the like belong to a set labeled by “book”, they belong to name data “book”.

  FIG. 2 illustrates two change sentence data (change sentence data X and Y). “Path” indicates affiliation information (path) indicating the affiliation destination in the structured document of the phrase data to be changed. In the nested structure, when another phrase data (referred to as phrase data B) directly belongs to a certain phrase data (referred to as phrase data A), the hierarchy of the phrase data B is one level lower than that of the phrase data A. is there. In this case, “/” is added between the phrase data A and the phrase data B in the affiliation information. For example, “/ books / book” shown in FIG. 2 indicates that the name data “books” belongs to the document data, and the name data “book” belongs to the name data “books”. Since there are two “/”, the depth of the “book” hierarchy is two.

  The location of the value data “a” and the like is represented by the belonging information of the name data “book” and the order in the name data “book”. “/ Books / book / 3” in the changed sentence data X shown in FIG. 2 is affiliation information indicating the value data of the third element of the name data “book” belonging to the name data “books”. Since there are three “/” in this affiliation information, the value data whose location is indicated by the corresponding affiliation information is in a hierarchy of depth 3. Referring to the document data to be changed in FIG. 2, the value data in the depth 3 hierarchy whose location is indicated by the path is “c”.

  In the changed sentence data, “src” and “dst” indicate data before the change of the phrase data to be changed and data after the change of the word data to be changed, respectively. The change statement data X including ““ src ”:“ book ”,“ dst ”:“ manual ”” of the two change statement data in FIG. 2 is used for changing the name data from “book” to “manual”. Change statement data.

  Similarly, the change statement data Y including ““ src ”:“ c ”,“ dst ”:“ d ””, the third value data “c” belonging to the name data “book” is changed to the value data “d”. This is change sentence data for changing to.

  Hereinafter, with reference to FIGS. 3 and 4, the case where the change sentence data X and Y shown in FIG. 2 are applied to the document data in this order will be described.

  FIG. 3 shows document data and change sentence data that have been changed by applying the change sentence data X. By applying the change sentence data X, the name data “book” belonging to the name data “books” in the document data is changed to the name data “manual”. Also, with this change sentence data X, “book” in the affiliation information included in the change sentence data Y is changed to “manual”.

  FIG. 4 shows the document data changed by applying the changed sentence data Y. By applying the change sentence data Y, the value data “c” belonging to the name data “book” in the document data is changed to the value data “d”. The change statement data Y changes the value data, and the value data is not included in the affiliation information. For this reason, the change information of other change statement data is not changed by the application of the change statement data Y.

  Referring to FIG. 1, the aggregating unit 13 aggregates the changed sentence data in the difference information extracted by the difference obtaining unit 12. Aggregation of change sentence data by the aggregation unit 13 is performed for each change instruction. In a certain change command, when there are two or more pieces of change statement data and change statement data for instructing a transitive change, the aggregation unit 13 combines the two or more pieces of change statement data into one. Summarize.

  FIG. 5 is a diagram for exemplifying the aggregation. The change sentence data P ““ path ”:“ / website / user / 3 ”,“ src ”:“ C ”,“ dst ”:“ None ”shown in FIG. 5 belongs to“ user ”belonging to“ website ”. This is change sentence data for erasing the third “C”. In addition, the change sentence data Q ““ path ”:“ / website / user / 3 ”,“ src ”:“ None ”,“ dst ”:“ D ”” shown in FIG. 5 is stored in “user” belonging to “website”. This is change sentence data for adding “D” as the third value data. By using these change sentence data in the above order, the third value data belonging to “user” belonging to “website” is changed from “C” to “Done” through a state corresponding to “None”. It turns out that it changes to. The state corresponding to “None” indicates an empty state in which nothing is included. Hereinafter, the empty data may be referred to as word data.

  In FIG. 5, the combination of the change sentence data S and T in this order is the change sentence data R ““ path ”:“ / website / user / 3 ”,“ src ”:“ C ”,“ dst ”:“ D ”. Is equivalent to. The aggregating unit 13 collects a plurality of pieces of change sentence data that can be combined into one, such as the change sentence data S and T, and rewrites the change sentence data into one piece of change sentence data. Hereinafter, the process of collecting a plurality of pieces of change sentence data is referred to as an aggregation process.

  Referring to FIG. 1, the sorting unit 14 is changed sentence data acquired from each of one or more change instructions for one document data, and the changed sentence data after processing by the aggregation unit 13 is applied to a word / phrase to be applied. Sort according to the depth of the data location. In the present embodiment, the sorting unit 14 rearranges the changed sentence data in the ascending order of the hierarchy.

  When receiving the merge instruction via the input / output unit 11, the source acquisition unit 15 acquires the original document data to be updated from the storage unit 10.

  The merging unit 16 updates the document data by applying each change sentence data related to one or more change commands to the document data acquired by the source acquisition unit 15 in the order rearranged by the sort unit 14. .

  The merging unit 16 applies each change sentence data of two or more pieces of difference information based on the order rearranged by the sorting unit 14. Thus, in the original document data, the path hierarchy is updated in order from the phrase data.

  Here, in this embodiment, the reason why the change sentence data is applied in order from the phrase data with a shallow path hierarchy is as follows. If the merging apparatus 1 applies the change sentence data for the phrase data having a deeper path hierarchy first, the merging apparatus 1 first searches for the phrase data of the path having the deepest hierarchy. In this case, if the nesting structure is complicated, there is a possibility that the update of the phrase data executed first is delayed. On the other hand, when the phrase data of the shallow path is updated first, the merging apparatus 1 tracks the nest structure from the shallow hierarchy and temporarily stores the tracking result, thereby performing the next update target. The tracking result can be used to grasp the location of the phrase data. Thereby, the time for update is shortened. In addition, when the phrase data of the path of the shallow hierarchy is deleted by updating, updating the data belonging to the phrase data first consumes update time. For this reason, in the merging apparatus 1 according to the present embodiment, the word / phrase data of the path having a shallow hierarchy is updated in order. However, the update may be performed first after the word / phrase data of the deep path is updated.

  The merging unit 16 changes the changed sentence data in two or more change instructions to the same word / phrase data, and when the updated word / phrase data by the changed sentence data are different from each other, Include each phrase data after update by change sentence. In this way, two or more change commands can be used, and the user is given an opportunity to check and select each phrase data after update by two or more change commands in the updated document data. Can be given.

  FIG. 6 is a diagram exemplifying the processing contents of the merging unit 16 when two pieces of changed sentence data that obtain different update results are applied to one word / phrase data. The phrase data to be changed in the original document data is “author” belonging to “books”. The results of two change commands that generate different update results from this document data are referred to as change result A and change result B. In the change result A, “author” is rewritten to “editor”. In the change result B, “author” is rewritten to “doctor”. The merging unit 16 uses word / phrase data having the same path as a change target and uses any of the change results based on the change sentence data acquired from each of two or more change instructions that generate different change results. In FIG. 6, the merging unit 16 rewrites “author” to “(“ editor ”or“ doctor ”)”, uses the change results A and B, and includes “editor” and “doctor” in the updated data. Indicates that it is not.

  When the word data in one change command is to be changed and the word data is not to be changed in another change command, the merging unit 16 responds to the change command to change the word data. Rewrite this word data.

  FIG. 7 exemplifies the processing method of the merging unit 16 in the case where there is only one change command for changing a certain phrase data among a plurality of change commands.

  When the change sentence data related to one change command changes the phrase data in a certain path, the merging unit 16 determines whether there is any change sentence data related to another change instruction that changes the phrase data in the same path. When there is only one change sentence data that changes the phrase data of a certain path, the merging unit 16 applies the change sentence data to the phrase data. The merging unit 16 may combine change sentence data related to two or more change commands for one document data, and change the phrase data of the same path. When there is a single piece of change sentence data, the merging unit 16 may apply the change sentence data to the document data. The merging unit 16 applies the changed sentence data in the order in which the sorting unit 14 rearranges them, includes each word / phrase data before and after the change as a candidate in the document data, and based on the changed sentence data when there is one change. The word data may be updated.

  FIG. 7 shows a change instruction (described as change instruction A) for updating the name data “author” to “editor” and a change instruction (described as change instruction B) for updating the value data “foo” to “bar”. The processing by the merging unit 16 in the case where there is a data is shown.

  In the example shown in FIG. 7, the merging unit 16 applies the changed sentence data in the order in which the sorting unit 14 has rearranged the document data “editor” changed according to the changed sentence data corresponding to the change instruction A. The original word data “author” is included in the document data. The merging unit 16 selects “editor” after the change and deletes “author” from the document data because there is no other change sentence data for the phrase data.

  In the example illustrated in FIG. 7, the merging unit 16 determines whether there is one change sentence data to be applied to one phrase data or another change sentence data to be applied to the same phrase data. Since there is no change sentence data for changing “foo” other than the change sentence data related to the change instruction B, the merging unit 16 changes “foo” to “bar” according to the change sentence data.

  In the example shown in FIG. 7, the merging unit 16 includes the data before and after the update as the candidate for the name data, and updates the value data after confirming that there is one change sentence. The changing method by the merging unit 16 is not limited to this.

  In this embodiment, when there is one change sentence data for one word / phrase data, the change based on the change sentence data is performed. As a result, the change instruction for the phrase data is reflected, and the user can save time and effort for selecting appropriate phrase data. However, the document data after execution of the change instruction by the merging unit 16 may include word data before and after the change. This is to prevent an unexpected change by another user.

The processing result by the merging unit 16 may be stored in the storage unit 10.
The selecting unit 17 selects two or more changed phrase data that the merging unit 16 includes as candidates in the document data in accordance with two or more changed sentence data that change the same phrase data to different phrase data. Processing related to selection is performed. When there are two or more candidates in the updated phrase data, the selection unit 17 issues a display instruction to the input / output unit 11 in order to cause the user to select one of the two or more candidates.

  FIG. 8 illustrates the display contents by the input / output unit 11 in response to a display instruction from the selection unit 17. FIG. 8 illustrates each display content when Graphical User Interface (GUI) and Character user interface (GUI) are used in the input / output unit 11. In this example, two name data “editor” and “doctor” connected by “or” shown in FIG. 6 are shown as options. When the GUI is used, the user can make an input for selection with respect to one of these options, and the input content is confirmed by clicking the “OK” button. . When the GUI is used, the user inputs “1” after selecting “editor” after “>>”, and “2” when selecting “doctor”, and press the Enter key. By pressing, the input content is confirmed.

  FIG. 9 illustrates a processing flow by the merging apparatus 1 according to the present embodiment until the merging process by the merging unit 16 is performed.

  As illustrated in FIG. 9, the difference acquisition unit 12 in the merging apparatus 1 extracts difference information for each change command from information related to each of the plurality of change commands stored in the storage unit 10 (step S <b> 100).

  10 to 12 are diagrams for specifically explaining the difference information extraction processing when there are two change commands. One of the two change instructions is a change instruction A, and the other is a change instruction B. The original document data is referred to as document data S.

  FIG. 10 shows a specific example of the difference information extraction process by the change instruction A. As shown in FIG. 10, the document data S is rewritten from the document data A1 to the document data A2 and from the document data A2 to the document data A3 by the change command A.

  As shown in FIG. 10, the difference acquisition unit 12 extracts change sentence data for changing from the document data S to the document data A1. This change sentence data is for rewriting “user” belonging to “website” to “user” in the document data S.

  The difference acquisition unit 12 extracts change sentence data for changing from the document data A1 to the document data A2. In this case, there are two change sentence data. One of the two changed sentence data changes the second value data “B” belonging to “user” belonging to “website” in the document data A1 to “C”. The other deletes the third value data “C” that also belongs to “user”.

  The difference acquisition unit 12 extracts change sentence data for changing from the document data A2 to the document data A3. The change statement data changes “user” belonging to “website” to “account” in the document data A2.

  FIG. 11 shows a specific example of the difference information extraction process by the change instruction B. The document data S is rewritten from the document data B1 to the document data B2 and from the document data B2 to the document data B3 by the change command B.

  The difference acquisition unit 12 extracts change sentence data for changing from the document data S to the document data B1. The change sentence data in this case is three. The first of these changes the first value data “A” belonging to “usar” belonging to “website” to “B”. Second, the second value data “B”, which also belongs to “usar”, is changed to “C”. Third, the third value data “C” belonging to “usar” is deleted.

  The difference acquisition unit 12 extracts change sentence data for changing from the document data B1 to the document data B2. The change statement data changes “user” belonging to “website” to “users” in the document data B1.

  The difference acquisition unit 12 extracts change sentence data for changing from the document data B2 to the document data B3. In the change sentence data, “D” is added as the third value data belonging to “users” belonging to “website” in the document data B2.

  FIG. 12 illustrates change sentence data in the difference information related to the change instruction A and change sentence data in the difference information related to the change instruction B. The change sentence data extracted by the difference acquisition unit 12 is included in the difference information in the order of change of the document data.

  According to the example shown in FIG. 12, in the difference information based on the change instruction A, the changed sentence data (changed sentence data A-1) for changing the document data S to the document data A1 is first included. In the difference information, next, two pieces of change sentence data for changing the document data A1 to the document data A2 are included. Note that the order of the difference information between the two pieces of change sentence data may be the first. Here, the change statement data for changing “B” to “C” is the change statement data A-2, the change statement data for deleting “C” is the change statement data A-3, and the difference information is in this order. These change sentence data shall be included. Further, the difference information finally includes change sentence data (changed sentence data A-4) for changing the document data A2 to the document data A3.

  According to the example shown in FIG. 12, in the difference information based on the change instruction B, three change sentence data for changing the document data S to the document data B1 are first included. In addition, the order in the difference information of these three change sentence data is arbitrary. Here, the change statement data for changing the above-mentioned “A” to “B” is the change statement data B-1, the change statement data for changing “B” to “C” is the change statement data B-2, and “C”. The change sentence data to be deleted is the change sentence data B-3, and the difference information includes these change sentences in this order. In addition, the difference information includes change sentence data (referred to as change sentence data B-4) for changing the document data B1 to the document data B2. In addition, the difference information finally includes change sentence data (change sentence data B-5) for changing the document data B2 to the document data B3.

  As shown in the flowchart of FIG. 9, the aggregating unit 13 performs an aggregation process when the following conditions are satisfied for two pieces of changed sentence data included in the difference information (step S101). The following conditions are based on the fact that the application target phrase data of two pieces of change sentence data have the same path, the phrase data after the change sentence data included in the difference information, and the change sentence data included later The phrase data before change is equal. Details of the aggregation processing will be described later.

  The sorting unit 14 rearranges the changed sentence data after the aggregation processing by the aggregating unit 13 based on the path hierarchy of the phrase data to which the changed sentence data is applied (step S102). As described above, this rearrangement is performed in the ascending order of the depth of the hierarchy.

  In the present embodiment, the processing in step S101 by the aggregation unit 13 is executed prior to the processing in step S102 by the sorting unit 14, but this order may be reversed.

  FIG. 13 shows an example of the processing content by the sorting unit 14. The change statement data related to the change command A and the change statement data related to the change command B shown here are obtained by performing aggregation processing on each change statement data illustrated in FIG. The change statement data A-1 and A-4 in FIG. 12 are aggregated, and the change statement after the aggregation processing is the change statement data A-1 ′ in FIG. The change sentence data B-3 and B-5 are aggregated, and the change sentence data after the aggregation process is B-3 'in FIG.

  As shown in FIG. 13, the hierarchies of the path of the phrase data to be changed in the changed sentence data A-1 ', A-2, and A-3 are 2, 3, and 3, respectively.

  Similarly, in the changed sentence data B-1, B-2, B-3 ', and B-4, the hierarchy of the path of the phrase data to be changed is 3, 3, 3, and 2, respectively.

  Each change sentence data related to the change instruction A is arranged in the difference information from before the sort in ascending order of the path hierarchy of the word / phrase data to be changed. For this reason, the order of the change sentence data A-1 ', A-2, and A-3 does not change before and after sorting.

  Each change sentence data related to the change instruction B is sorted by the sort unit 14 in ascending order of the hierarchy of the path of the phrase data to be changed, in the order of the change sentence data B-4, B-1, B-2, B-3 ′. Rearranged.

  Referring to FIG. 9, the merging unit 16 applies the changed sentence data to the document data before change acquired by the source acquisition unit 15 based on the order rearranged in step S102 (step S103). Thereby, the merging unit 16 merges a plurality of document data generated by applying a plurality of change commands to one document data.

  FIG. 14 illustrates the details of the processing by the aggregation unit 13 in step S101. Here, a case will be described as an example where the aggregation unit 13 performs an aggregation process of change sentence data related to each of two change instructions. These two change instructions are referred to as change instruction A and change instruction B. The aggregating unit 13 executes the processes from step S200 to S202 for each of the change instructions A and B. For example, the aggregating unit 13 executes the processes of steps S200 to S202 for the change sentence data in the difference information related to the change instruction A, and then executes the processes of steps S200 to S202 for the change sentence data in the difference information related to the change instruction B. Execute the process.

  In step S200, the aggregating unit 13 performs preprocessing for aggregating change sentence data. The preprocessing is processing for preventing an error in specifying a path in the change sentence data at the time of aggregation. In the preprocessing in the present embodiment, when there is a path change in another change sentence data based on a change in name data by applying a certain change sentence data, the path in the other change sentence data after the change is changed. This is a process of rewriting to the previous path.

  FIG. 15 illustrates a part of the pre-processing flow. i is a natural number from 1 to N corresponding to the order of the change sentence data in the difference information. N is a natural number of 1 or more. The changed sentence data with i = 1 is the first changed sentence data in the difference information, and the changed sentence data with i = N is the last changed sentence data in the difference information. The aggregating unit 13 executes the process of step S300 in this order for each change sentence data from the first to the Nth.

  The aggregating unit 13 determines whether or not the i-th change sentence data is subject to name data change (step S300). In the present embodiment, it is determined whether the name data is to be changed, and it is not determined whether the value data is to be changed. This is because the change sentence data in this embodiment does not include value data, but name data is included as part of the path. However, the present invention is not limited to this, and when value data other than name data is included in the path, the aggregating unit 13 may perform the process in step S301 without performing the determination process in step S300.

  When the i-th change statement data does not change the name data (step S300: No), the aggregation unit 13 ends the pre-processing for the i-th change statement data, replaces i + 1 with i, and performs step S300. Process. When the change statement data in the case of i = N does not change the name data, the aggregating unit 13 executes the aggregation process shown in FIG. 14 (step S201). This aggregation process will be described later. When the i-th change sentence data has the name data as a change target (step S300: Yes), the aggregation unit 13 performs the process of step S301 on each of the i + 1 to N-th change sentence data. After completing the process of step S301, the aggregation unit 13 replaces i + 1 with i if i <N and returns the process to step S300. If i = N, the aggregation unit 13 performs the aggregation process shown in FIG. Execute (Step S201).

  FIG. 16 is a flowchart illustrating details of the processing by the aggregation unit 13 in step S301. The aggregating unit 13 performs the following processing from step S400 shown in FIG. 16 on each of the i + 1th to Nth change sentence data.

  The aggregating unit 13 determines whether or not the path of the j-th (i + 1 ≦ j ≦ N) modified sentence data includes the name data path after application of the i-th modified sentence data (step S400). When the path of the name data after application of the i-th change sentence data does not include the path in the j-th change sentence data (step S400: No), and j is smaller than N, the aggregating unit 13 sets j + 1 to j And the process returns to step S400. In the case of j = N, the aggregating unit 13 ends the preprocessing, and executes the aggregation process in step S201 illustrated in FIG.

  When the determination condition in step S400 is satisfied (step S400: Yes), the aggregation unit 13 determines whether the j-th change sentence data further changes the name data after application of the i-th change sentence data. (Step S401).

  If the name data after application of the i-th change statement data is not further changed by the application of the j-th change statement data (step S401: No), the aggregating unit 13 sets the path in the j-th change statement data to the i-th change data. Are rewritten to those before application of the change sentence data (step S402).

  The aggregating unit 13 temporarily stores the identifier of the j-th change sentence and each path before and after rewriting in association with each other (step S403). The process in step S403 is for post-processing described later. The identifier is a value including a numerical value, a character, a symbol, or the like uniquely given to each change sentence in the difference information, and the above A-1 is an example of this identifier. Hereinafter, information temporarily stored in step S403 is also referred to as rewrite information. The temporary storage of rewrite information refers to a period until the end of post-processing described later, for example.

  In this embodiment, the process of step S403 is executed after the process of step S402, but this order may be reversed.

  After execution of the process of step S403, if j is smaller than N, the aggregating unit 13 replaces j + 1 with j, and returns the process to step S400. In the case of j = N, the aggregating unit 13 ends the preprocessing, and executes the aggregation process in step S201 illustrated in FIG.

  When the name data after application of the i-th change statement data is further changed by the application of the j-th change statement data (step S401: Yes), the aggregation unit 13 causes each of the j + 1-th to N-th change statement data. For step S404, the process of step S404 is executed. The processing in step S404 is the same as the processing in step S301 whose details are shown in FIG.

  The subroutine processing in step S404 will be described by taking as an example a case where the processing by the aggregation unit 13 is performed on the changed sentence data A-1 to the changed sentence data A-4 shown in FIG. In this case, the difference information will be described assuming a case in which changed sentence data A-5 having a path including “/ website / account” is included after the changed sentence data A-4. That is, the change sentence data A-5 is subject to change in the phrase data included in the name data “account” in the name data “website”.

  The aggregation unit 13 determines in step S300 in FIG. 15 that the change target of the change sentence data A-1 is name data, starts the process of step S301, and changes the change sentence data A-2 to the change sentence data A-4. On the other hand, the process after step S400 is performed.

  At this time, since the change sentence data A-2 and A-3 do not change the name data, the process of step S402 and the process of step S403 are performed for these change sentence data after the process of step S401. Done. At this time, “user” included in each path of the changed sentence data A-2 and A-3 is rewritten to “usar” in step S402, and each identifier is associated with each path before and after rewriting in step S403. Stored as rewrite information. At this time, in the case of the change sentence data A-2, the paths before and after rewriting included in the rewriting information are “/ website / user / 2” and “/ website / user / 2”, respectively.

  In step S401, the aggregation unit 13 determines that the name data after application of the change sentence data A-1 is further changed by the application of the change sentence data A-4. Specifically, application of the change sentence data A-1 changes the name data “usar” in the path indicated by “/ website / user” to “user”, and this “user” is applied to the change sentence data A-4. To “account”.

  For this reason, with respect to the change sentence data A-4, the aggregation unit 13 executes the process of step S404 after the process of step S401. Since the path in the changed sentence data A-5 includes the path of the name data changed by the changed sentence data A-4, “/ website / account” in the path is rewritten to “/ website / usar” in step S402. It is done.

  In the present embodiment, the path after rewriting in step S402 in step S404 includes the path of name data before application of the i-th changed sentence data.

  By the process of step S403 in step S404, a path including “/ website / account” and a path including “/ website / usar” are stored as the paths before and after the rewriting of the changed sentence data A-5. In the rewrite information, “/ website / user” included in each path in the modified sentence data A-2 and A-3 and “/ website / account” included in the path in the modified sentence data A-5 are the same. Corresponding to “/ website / usar”.

  In this case, the aggregating unit 13 sets “/ website / usar” to “/ website / account” in the path for document data matching in the subsequent aggregation processing (step S201) and postprocessing (step S202). Associate. Accordingly, the aggregating unit 13 replaces “/ website / user” included in the path before rewriting with “/ website / account” in the rewrite information of the change sentence data A-2 and A-3.

  FIG. 17 is a diagram illustrating a specific example of the change sentence data before and after execution of the preprocessing by the aggregation unit 13. With reference to FIG. 17, the pre-processing executed for the change statement data related to the change instruction B will be described. As shown in FIG. 17, the change sentence data B-1 to the change sentence data B-3 relate to the change of the value data without the change of the path. On the other hand, the change statement data B-4 is to change the name data “usar” to “users”. With this change, the path for specifying the name data is changed from “/ website / usar” to “/ website / users ".

  In the difference information, the path of the change sentence data B-5 next to the change sentence data B-4 includes a path “/ website / users” that specifies name data after application of the change sentence data B-4. Yes. The change sentence data B-5 is not for further changing the name data to be changed in the change sentence data B-4.

  The aggregation unit 13 rewrites “/ website / users” in the change sentence data B-5 to “/ website / user” before the change sentence data B-4 is applied.

  As illustrated in FIG. 14, the aggregation unit 13 executes the aggregation process after the execution of the above-described preprocessing (step S200) (step S201).

  FIG. 18 is a flowchart illustrating details of the aggregation processing in step S201. The aggregating unit 13 matches the path in each of the i-th and j-th change sentence data in the difference information, and the phrase data after application of the i-th change sentence data and before application of the j-th change sentence data. It is determined whether the phrase data are equal (step S500). i is a natural number from 1 to N. N is the total number of change sentence data included in the difference information, and is a natural number of 1 or more. J is a natural number between i + 1 and N. Prior to the processing in step S500, the aggregation unit 13 stores 1 in i, stores 2 (= i + 1) in j, and starts the processing in step S201.

  The aggregation unit 13 does not match the paths in the i-th and j-th change sentence data, or the phrase data after application of the i-th change sentence data and the phrase data before application of the j-th change sentence data are equal. If not (step S500: No), j + 1 is replaced with j. In this case, the process returns to the process of step S500. If j = N and i is smaller than N, the aggregating unit 13 replaces i + 1 with i, and returns to the process of step S500. When i = N, the aggregating unit 13 ends the process of step S201 illustrated in FIG. 14 and performs the post-process of step S202.

  The aggregating unit 13 matches the paths in the i-th and j-th change sentence data, and the phrase data after application of the i-th change sentence data is equal to the phrase data before application of the j-th change sentence data (step S500: Yes), the i-th change sentence data is changed (step S501). Specifically, the aggregation unit 13 sets the changed phrase data indicated as “dst” as “dst” in the j-th changed sentence data, as shown in FIG. 2, for example, in the i-th changed sentence data. Change to the changed phrase data shown.

  When the combination of two or more pieces of change sentence data corresponds to changing the phrase data specified by a certain path in a transitive manner, the aggregating unit 13 combines them into one. The change text data combined into one indicates a change from the phrase data when no change sentence is applied to one of the combinations to the phrase data when the change sentence data combination is applied. It will be a thing. By this aggregation processing, it is possible to combine a plurality of times of application of the change sentence data at one time, and the processing time for subsequent merge processing and the like is shortened.

  The aggregation unit 13 deletes the jth change sentence data from the difference information (step S502). This is because the i-th change statement data can be used to obtain the change result of the j-th change statement data in the document data.

  FIG. 19 is a diagram for specifically explaining the aggregation processing. As shown in FIG. 19, in the difference information, the third change sentence data B-3 and the fifth change sentence data B-5 have the same path. Further, the phrase data “None” after application of the modified sentence data B-3 (dst) (the phrase data “None” indicates the deleted empty data) and before the application of the modified sentence data B-5 Is identical to the phrase data “None”.

  Therefore, the aggregation unit 13 assumes that the determination condition in step S500 is satisfied, and changes the phrase data “None” after the change in the change sentence data B-3 to the change in the change sentence data B-5 in step S501. Change to the later phrase data “D”. The identifier of the changed sentence data B-3 after the change is replaced with B-3 '. The change sentence data B-5 is deleted in step S502.

  Although not shown, the change sentence data A-1 and the change sentence data A-4 are also aggregated, and the path in the change sentence data A-1 ′ after aggregation is “/ website / usar”, and the change sentence data A−. The phrase data before and after the application of 1 ′ are “usar” and “account”, respectively.

  After the process of step S201, the aggregating unit 13 executes a post process for restoring the information rewritten in the pre process (step S202).

  FIG. 20 is a flowchart illustrating details of the post-processing in step S202. In FIG. 20, the aggregating unit 13 executes the processes after step S600 in the order of the change sentence data included in the difference information. The aggregation unit 13 stores 1 in i at the start of step S202.

  The aggregation unit 13 refers to the rewrite information and determines whether the identifier of the i-th changed sentence data in the difference information is included (step S600).

  When the identifier of the i-th changed sentence data is not included in the rewrite information (step S600: No), and i is less than N ′, the aggregating unit 13 replaces i + 1 with i, and in step S600 Return to processing. N ′ is the total number of changed sentence data included in the difference information after the aggregation process. In the case of i = N ′, as shown in FIG. 14, the processing for one difference information by the aggregation unit 13 ends. After post-processing (step S202) for certain difference information in FIG. 14, when post-processing has not been completed for other difference information, the aggregating unit 13 executes the processing after step S200 for the other difference information. To do. As the process of step S202 ends for the other difference information, the aggregation unit 13 ends the process.

  When the identifier of the i-th changed sentence data is included in the rewrite information (step S600: Yes), the aggregation unit 13 refers to each path before and after the rewrite in step S402, which is stored in association with the identifier. The aggregating unit 13 changes the rewritten path to the pre-rewritten path based on each stored path (step S601). Thereby, for example, the path “/ website / usar / 2” in the change sentence data A-2 becomes “/ website / account / 2” based on the change by the application of the change sentence data A-1 ′.

  FIG. 21 illustrates a processing flow by the merging unit 16. In the process shown in FIG. 21, the difference information is sorted in the ascending order of the hierarchy of the path specifying the phrase data to be changed. Here, a case where a merge process is performed using two pieces of difference information will be described as an example. One of the two pieces of difference information is set as difference information A, and the other is set as difference information B. Let M be the deepest hierarchy of the path hierarchy included in the change sentence data in the two pieces of difference information A and B. M is a natural number of 1 or more.

  The merging unit 16 determines whether there is change sentence data with a path hierarchy of k in the difference information A (step S700). Prior to step S700, 1 is first stored in k. When the change sentence data whose path hierarchy is k does not exist in the difference information A and B (step S700: No), the merging unit 16 replaces k + 1 with k, and returns to the process of step S700. When the change sentence with the path hierarchy k exists in the difference information A and B (step S700: Yes), the merging unit 16 selects one of the change sentence data with the path hierarchy k as the processing target (step S700). S701). The change sentence data selected by the merging unit 16 in step S701 is referred to as change sentence data P. Hereinafter, a case where the change sentence data P is included in the difference information A will be described.

  In the difference information B, the merging unit 16 determines whether there is changed sentence data whose path hierarchy is k and includes the same path as the path of the changed sentence data P (step S702). . Here, the change sentence data in the difference information B including the same path as the path of the change sentence data P with the path hierarchy being k is assumed to be the change sentence data Q. When there is the change sentence data Q (step S702: Yes), the merging unit 16 determines whether each word data after application of the change sentence data P and Q (dst) is equal (step S703). When the phrase data after application of the changed sentence data P and Q are equal (step S703: Yes), the merging unit 16 deletes the changed sentence data B (step S704), and the documents to which the difference information A and B are applied. The change sentence P is applied to the data (step S705). At this time, the merging unit 16 may include the phrase data before application of the change sentence data P in addition to the phrase data after application of the change sentence data P in the document data after application of the change sentence data P. Hereinafter, the document data to which the difference information A and B is applied is referred to as document data S.

  When the phrase data after application of the changed sentence data P and Q is different (step S703: No), the merging unit 16 converts the phrase data after application of the changed sentence data P and Q to the document data S after the change. It is included as a candidate in the document data S (step S706). These candidates are connected to each other by “or” as illustrated in FIG.

  Here, when either one of the change sentence data P and Q is for deleting the phrase data, in the present embodiment, the change sentence data is not applied and the other change sentence data is applied. The

  When the merging unit 16 applies each change sentence data of the difference information A and B, by performing the processing of steps S703 to S706 for the same path, any one of a plurality of change instructions competing for one phrase data is selected. Can also be used. Thereby, in the update of one phrase data by a plurality of users, it is possible to prevent a situation in which an update result by the other user is deleted due to an update by one user or a situation in which an undesired update result is obtained. . The merging unit 16 determines whether or not the changed sentence data in step S705 or step S706 is for changing the name data (step S707). The merger 16 returns the process to step 700 when the changed sentence data in steps S705 and S706 is not related to the change of the name data (step S707: No).

  When the change sentence data P and Q in steps S705 and S706 relate to the change of the name data (step S707: Yes), the merging unit 16 uses the path for specifying the name data before the change as the path in the other change sentence data. (Step S708). The merger 16 returns the processing to Step 700 when there is no other changed sentence data including a path for designating the name data before application of the changed sentence data P and Q (Step S708: No).

  When there is other change statement data including a path for specifying the name data before application of the change statement data P and Q (step S708: Yes), the merging unit 16 changes the path in the other change statement data. The sentence data P or the changed sentence data Q is applied (step S709). At this time, the merging unit 16 associates and temporarily stores each path before the application of the change sentence data P and Q and each path after the application in the other change sentence data. For example, consider a case where the name data is changed by applying the changed sentence data P and Q in step S706, and the path in the other changed sentence data is changed in step S709. In this case, the changed sentence data in which the path is changed in the difference information A and the changed sentence data in which the path is changed in the difference information B are different paths even though they were the same path before the change. there is a possibility. For this reason, the paths in the change statement data of the difference information A and B, which are the same path before the change and different paths after the change, are associated with each other. As a result, in the subsequent step S702, it is possible to prevent the changed sentences of the difference information A and B from being treated as different paths that should be the same.

  In the processing of steps S700 to S709, the merging unit 16 applies each change sentence data in two or more pieces of difference information in order from the shallowest path. As a result, in the document data, the phrase data specified by the shallow path to the phrase data specified by the deep path can be sequentially changed using two or more change commands. Therefore, it is possible to obtain a merge result utilizing two or more change instructions.

  This will be specifically described with reference to FIG. For example, consider a case where the change instruction A is applied from change sentence data including a path having a shallow hierarchy, and the change instruction B is applied from a path having a deep hierarchy. In the change instruction A, the change sentence data A-1 and A-3 are applied in this order, and in the change instruction B, the change sentence data B-3 'and B-4 are applied in this order. At this time, if the changed sentence data B-3 'is applied before the changed sentence data A-3, the phrase data "C" to be applied to the changed sentence data A-3 does not exist. If the change sentence data A-3 is for changing “C” to “E”, the change sentence data A-3 is not used. Similarly, for example, by applying the change sentence data A-1 ′ before the change sentence data B-4, the phrase data “usar” to which the change sentence data B-4 is applied disappears, and the change sentence data B-4 cannot be utilized. In this way, when change sentence data in which the path hierarchy is not complete is applied, merging of structured documents is not appropriate, and an unintended result for the user is caused. However, when applying change sentence data with a uniform path hierarchy, for example, the phrase data specified in the shallow hierarchy path can be updated in order using the change instructions A and B, and the change results are also consistent. Sex is satisfied. As a result, merging of structured documents is performed appropriately.

  The merging unit 16 deletes unnecessary word / phrase data candidates in the document data S after the change (step S711). For example, in step S705, when the phrase data before application of the changed sentence data A is included as a candidate in the document data S after the change, the merging unit 16 deletes the phrase data.

  The merging unit 16 instructs the selection unit 17 to execute processing for causing the user to select an appropriate item from among a plurality of candidate word / phrase data in the document data via the input / output unit 11 (step S712).

  22 to 25 illustrate a processing method by the merging unit 16. In this example, the merging unit 16 performs the merging process using the changed sentence data after the sort process illustrated in FIG. Difference information including the change statement data A-1 ′, A-2, and A-3 is set as difference information A, and difference information including the change statement data B-1, B-2, B-3 ′, and B-4 is set as a difference. Let it be information B.

  In this example, in the difference information A and B, there is no change statement data with a path hierarchy of 1, and there is change statement data with a hierarchy of 2. Here, a case where the changed sentence data A-1 ′ is selected in the first step S701 will be described.

  In step S702, the merging unit 16 executes the process of step S703 because there is a change sentence B-4 in the same path as that in the change sentence data A-1 'in the hierarchy 2 path. In step S703, the merging unit 16 determines that the phrase data after application of the modified sentence data A-1 'and the modified sentence data B-4 are different. In accordance with this determination result, the merging unit 16 applies the changed sentences A-1 'and B-4 to the document data to be changed (referred to as document data S) in step S706.

  FIG. 22 shows the document data S to be changed. By applying the changed sentence data A-1 ′ and B-4 in step S706, the phrase data “usar” in the document data S is data “account” or “2” including two candidate phrase data “account” and “users”. Changed to “users”. Thereby, the document data S is changed to the document data S1.

  In step S707, the merging unit 16 determines that the changed sentence data applied in step S706 relates to the change of the name data. In step S708, the merging unit 16 changes the changed sentence data B-1, B-2, B-3 including the path of the name data “usar” before application of the changed sentence data B-4 as shown in FIG. Is determined, and the process of step S709 is executed. In step S709, the merging unit 16 changes “usar” in each path of the changed sentence data B-1, B-2, and B-3 to “users”.

  Note that the merging unit 16 temporarily stores the path “/ website / account” and the path “/ website / users /” in association with each other for later processing.

  The merging unit 16 performs the processing from step S700 onward when the hierarchy is 3 because there is no other change sentence data including a path with a hierarchy of 2. This process will be described with reference to FIG. 21 and FIGS. In FIG. 23 and subsequent figures, already applied change sentence data is not described.

  The merging unit 16 selects the change sentence A-2 in step S701. Referring to FIG. 23, the path hierarchy in the change sentence data A-2 is equal to the path hierarchy in the change sentence data B-2. Here, the merging unit 16 stores “/ website / account” and “/ website / users /” in association with each other. Therefore, in step S702, the merging unit 16 determines that there is the change sentence data B-2 including the same path “/ website / users /” as the path “/ website / account / 2” in the change sentence data A-2. To do.

  Since the phrase data after application of the changed sentence data A-2 and B-2 are equal to each other and “C”, the merging unit 16 deletes the changed sentence data B-2 and changes it to the document data S1 in step S705. On the other hand, the change sentence data A-2 is applied. This change is a change of value data, not name data. For this reason, the path of other change sentence data in the difference information is not changed.

  In the document data S1 shown in FIG. 23, the second “B” of the three value data is changed to “C” and changed to the document data S2.

  Next, consider the case where the merging unit 16 selects the change sentence data A-3 in step S701. Referring to FIG. 24, the path hierarchy in the modified sentence data A-3 is equal to the path hierarchy in the modified sentence data B-3 '. From the correspondence between the above “/ website / account” and “/ website / users /”, the paths “/ website / account / 3” and “/ website / users / 3” in the changed sentence data A-3 and B-3 ′ "Matches in step S702.

  The change statement data A-3 is for deleting the value data “C”, and the change statement data B-3 ′ is for changing the value data “C” to “D”. For this reason, the merging unit 16 applies the changed sentence data B-3 ′ to the wording data S2 in step S706. Accordingly, as shown in FIG. 24, the document data S2 is changed to the document data S3, and the value data “C” in the document data S2 is changed to the value data “D” in the document data S3. .

  The merging unit 16 selects the changed sentence data B-1 that has not been applied yet in step S701, and applies the changed sentence data B-1 to the document data S3 in step S705. By applying the change sentence data B-1, the value data “A” in the document data S3 is changed to “B” and the document data S3 is changed to the document data S4 as shown in FIG.

  FIG. 26 illustrates a hardware configuration of the merging apparatus 1 according to the present embodiment. Here, the merging apparatus 1 has hardware as a general computer, and the processing by the merging apparatus 1 is executed by specifically using the hardware 2 shown below.

  The hardware 2 includes a processor 20, a memory 21, a storage device 22, a user interface circuit 23, and the like connected to each other by a bus 24.

  The processor 20 is, for example, a single core, dual core, or multi-core processor.

  The memory 21 is, for example, a ROM (Read Only Memory), a RAM (Random Access Memory), a semiconductor memory, or a combination thereof.

  The processor 20 executes various programs (including a merge program) stored in the memory 21, so that the difference acquisition unit 12, the aggregation unit 13, the sort unit 14, the source acquisition unit 15, the merge unit 16, Each function of the selection unit 17 can be realized.

  The storage device 22 is, for example, a hard disk drive, an optical disk device, or a combination thereof, and may include a portable storage medium. The function of the storage unit 10 described above can be realized by the storage device 22.

  The user interface circuit 23 is a circuit for connecting an output device such as a display device using a liquid crystal or CRT (Cathode Ray Tube) or the like, or an input device such as a keyboard or a mouse, to the merging device 1. The function of the input / output unit 11 can be realized by the user interface circuit 23 and the input device and output device connected thereto.

  In addition to the case described above, all or some of the functional blocks of the merging apparatus 1 shown in FIG. 1 may be realized by dedicated hardware as appropriate.

  The merging device 1 according to the present embodiment rearranges the change sentence data in accordance with the path hierarchy in each change sentence data in a plurality of change instructions. The merging apparatus 1 applies each change sentence data in two or more pieces of difference information in order from the shallowest (or deeper) path. As a result, in the document data, the phrase data specified by the shallow path to the phrase data specified by the deep path can be sequentially changed using two or more change commands. For this reason, it is possible to obtain a merged result that conforms to the structure of the document data and uses two or more change commands. In addition, when there is change sentence data that changes the phrase data of the same path in each of the two or more pieces of difference information, the merging apparatus 1 uses any of the application results of these change sentence data as the document data after the change. Use it by incorporating it into As a result, even when there are two or more change commands competing, these change commands can be utilized without destroying the document data.

  The merging apparatus 1 can also be used when there are two or more change sentences for the word data at a certain position of the document data in one difference information and changes using these change sentences are transitive. Aggregate change statements. This shortens the time for the merge process.

  Various embodiments and modifications can be made to the present invention without departing from the broad spirit and scope of the present invention. Further, the above-described embodiment is for explaining the present invention, and does not limit the scope of the present invention. Various modifications within the scope of the claims and within the scope of the equivalent invention are also considered within the scope of the present invention.

DESCRIPTION OF SYMBOLS 1 Merge apparatus 2 Hardware 10 Storage part 11 Input / output part 12 Difference acquisition part 13 Aggregation part 14 Sort part 15 Source acquisition part 16 Merge part 17 Selection part 20 Processor 21 Memory 22 Storage apparatus 23 User interface circuit

Claims (12)

First difference information indicating a difference between the first structured document and the structured document for the first structured document and the second structured document generated by separate updates to the structured document; and Obtaining second difference information indicating a difference between the second structured document and the structured document;
The first hierarchy data to which the first word / phrase data to be applied to the first change sentence data included in the first difference information belongs in the structured document, and the first hierarchy included in the second difference information. The second change sentence data to which the second change phrase data is applied is based on the respective depths of the second hierarchy to which the second phrase data belongs in the structured document. Determine the order in which statement data is applied,
When applying the first change sentence data to the structured document based on the application order, a second word / phrase data belonging to a second hierarchy equal to the first hierarchy is applied. The merged apparatus executes the process of merging the first structured document and the second structured document by also applying the change sentence data of the above to the structured document and merging the first structured document and the second structured document. The first change sentence data included in the first difference information is rearranged based on the first hierarchy, and the second change sentence data included in the second difference information is changed to the second hierarchy. Sort based on
Determining an application order of the first change sentence data and the second change sentence data to the structured document based on the rearranged order;
The merging method according to claim 1, wherein the merging device executes processing.   The merging method according to claim 1 or 2, wherein the application order is an ascending order of the first hierarchy and the second hierarchy. The first change sentence data includes first affiliation information indicating an affiliation relationship in the structured document of the first phrase data to be applied, and the second change sentence data is the first change sentence data to be applied. And the second affiliation information indicating the affiliation relationship of the two phrase data in the structured document, and when the first affiliation information and the second affiliation information are equal, the first change sentence data 4. The merger according to claim 1, wherein the merger executes a process of applying the second change sentence data to the structured document when applied to the structured document. 5. Merge method. The first affiliation information is the same as the second affiliation information, and the first word / phrase data after application of the first change sentence data is applied after the application of the second change sentence data. If the first phrase data is different from the second phrase data, the first phrase data after the first modified sentence data is applied to the structured document after merging the first structured document and the second structured document; The merging method according to claim 4, wherein the merging device executes a process of including the second word / phrase data after application of the second change sentence data. When the first affiliation information and the second affiliation information are equal, the first phrase data after application of the first change sentence data and the second after application of the second change sentence data 6. The merging method according to claim 5, wherein the merging device executes a process of outputting the phrase data. When the first affiliation information and the second affiliation information match, the first phrase data after application of the first change sentence data and application of the second change sentence data The merge device executes a process of applying one of the first modified sentence data and the second modified sentence data to the structured document when the second phrase data after the second phrase data is equal. The merging method according to any one of claims 4 to 6. In the case where the first affiliation information and the second affiliation information match, the first phrase data is changed to another phrase data by applying the first change sentence data, and the second When the second phrase data is deleted by applying the modified sentence data, the first modified sentence data is applied to the structured document, and the second modified sentence data is applied to the structured document. The merging method according to any one of claims 4 to 7, wherein the merging device executes a process of merging the first structured document and the second structured document without performing the process. When the first affiliation information is changed by the application of the first change sentence data, the affiliation relationship is determined by the first other affiliation information including the first affiliation information in the first difference information. When there is a first other change sentence data whose change target is the other word / phrase data shown, the first affiliation information included in the first other affiliation information is changed to the first change sentence data. Change to the first affiliation information after application,
When the second affiliation information is changed by application of the second change sentence data, the affiliation relationship is determined by the second other affiliation information including the second affiliation information in the second difference information. When there is a second other change sentence data whose change target is the other word data shown, the second affiliation information included in the second other affiliation information is changed to the second change sentence data. The merging method according to any one of claims 4 to 8, wherein the merging device executes a process of changing to the second affiliation information after application. In the first difference information, when there are two or more first change sentence data for transitively updating the first word / phrase data, the two or more first change sentence data are Aggregate and rewrite to one new first change sentence,
In the second difference information, when there are two or more second change sentence data for transitively updating the second phrase data, the two or more second change sentence data are Aggregate and rewrite to a new second change sentence,
The merger executes a process of determining the application order using the one new first change sentence and the one new second change sentence. The merge method according to claim 1. First difference information indicating a difference between the first structured document and the structured document for the first structured document and the second structured document generated by separate updates to the structured document; and A difference acquisition unit that acquires second difference information indicating a difference between the second structured document and the structured document;
The first hierarchy data to which the first word / phrase data to be applied to the first change sentence data included in the first difference information belongs in the structured document, and the first hierarchy included in the second difference information. The second change sentence data to which the second change phrase data is applied is based on the respective depths of the second hierarchy to which the second phrase data belongs in the structured document. When an application order of sentence data is determined and the first change sentence data is applied to the structured document based on the application order, a second hierarchy belonging to a second hierarchy equal to the first hierarchy A second modification sentence data to which word data is applied is also applied to the structured document, and a merging unit for merging the first structured document and the second structured document is provided. Features merger. First difference information indicating a difference between the first structured document and the structured document for the first structured document and the second structured document generated by separate updates to the structured document; and Obtaining second difference information indicating a difference between the second structured document and the structured document;
The first hierarchy data to which the first word / phrase data to be applied to the first change sentence data included in the first difference information belongs in the structured document, and the first hierarchy included in the second difference information. The second change sentence data to which the second change phrase data is applied is based on the respective depths of the second hierarchy to which the second phrase data belongs in the structured document. Determine the order in which statement data is applied,
When applying the first change sentence data to the structured document based on the application order, a second word / phrase data belonging to a second hierarchy equal to the first hierarchy is applied. A merged program that causes the merger to execute a process of merging the first structured document and the second structured document by applying the change sentence data of the above to the structured document.

Images