CA2255047A1 - Comparison of hierarchical structures and merging of differences - Google Patents
Comparison of hierarchical structures and merging of differences Download PDFInfo
- Publication number
- CA2255047A1 CA2255047A1 CA002255047A CA2255047A CA2255047A1 CA 2255047 A1 CA2255047 A1 CA 2255047A1 CA 002255047 A CA002255047 A CA 002255047A CA 2255047 A CA2255047 A CA 2255047A CA 2255047 A1 CA2255047 A1 CA 2255047A1
- Authority
- CA
- Canada
- Prior art keywords
- file
- base
- elements
- modified
- files
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Abandoned
Links
- 238000000034 method Methods 0.000 claims description 35
- 238000012545 processing Methods 0.000 claims description 8
- 230000001419 dependent effect Effects 0.000 abstract 1
- 230000006870 function Effects 0.000 description 7
- 230000008859 change Effects 0.000 description 5
- 238000004590 computer program Methods 0.000 description 4
- 238000010586 diagram Methods 0.000 description 4
- 230000008569 process Effects 0.000 description 4
- 230000000644 propagated effect Effects 0.000 description 4
- 230000009471 action Effects 0.000 description 2
- 230000001413 cellular effect Effects 0.000 description 1
- 238000010348 incorporation Methods 0.000 description 1
- 238000012986 modification Methods 0.000 description 1
- 230000004048 modification Effects 0.000 description 1
- 230000003287 optical effect Effects 0.000 description 1
Classifications
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F16/00—Information retrieval; Database structures therefor; File system structures therefor
- G06F16/90—Details of database functions independent of the retrieved data types
- G06F16/904—Browsing; Visualisation therefor
-
- Y—GENERAL TAGGING OF NEW TECHNOLOGICAL DEVELOPMENTS; GENERAL TAGGING OF CROSS-SECTIONAL TECHNOLOGIES SPANNING OVER SEVERAL SECTIONS OF THE IPC; TECHNICAL SUBJECTS COVERED BY FORMER USPC CROSS-REFERENCE ART COLLECTIONS [XRACs] AND DIGESTS
- Y10—TECHNICAL SUBJECTS COVERED BY FORMER USPC
- Y10S—TECHNICAL SUBJECTS COVERED BY FORMER USPC CROSS-REFERENCE ART COLLECTIONS [XRACs] AND DIGESTS
- Y10S707/00—Data processing: database and file management or data structures
- Y10S707/99951—File or database maintenance
- Y10S707/99952—Coherency, e.g. same view to multiple users
- Y10S707/99953—Recoverability
-
- Y—GENERAL TAGGING OF NEW TECHNOLOGICAL DEVELOPMENTS; GENERAL TAGGING OF CROSS-SECTIONAL TECHNOLOGIES SPANNING OVER SEVERAL SECTIONS OF THE IPC; TECHNICAL SUBJECTS COVERED BY FORMER USPC CROSS-REFERENCE ART COLLECTIONS [XRACs] AND DIGESTS
- Y10—TECHNICAL SUBJECTS COVERED BY FORMER USPC
- Y10S—TECHNICAL SUBJECTS COVERED BY FORMER USPC CROSS-REFERENCE ART COLLECTIONS [XRACs] AND DIGESTS
- Y10S707/00—Data processing: database and file management or data structures
- Y10S707/99951—File or database maintenance
- Y10S707/99952—Coherency, e.g. same view to multiple users
- Y10S707/99954—Version management
Abstract
A software tool to allow a user to compare a base file containing XML
statements to a modified file and from the comparison, create a third file. The comparison between the base and modified files results in a comparison tree which contains, as nodes, all of the information in the base file as well as the differences located in the modified file. Differences between the nodes of the two files are highlighted in a comparison tree and the user may resolve the differences to create a third file or optionally incorporate the selected differences into the base file. As nodes are examined in the comparison tree and decisions made as to which nodes to include in the third file, differences in the comparison tree are resolved. As a difference is resolved, any node in the comparison tree dependent upon the now resolved difference is no longer highlighted if it too has had the difference resolved. The tool is most commonly used to determine changes made to a source code base file and allows the individual maintaining a stable source code base to determine if the changes in the modified file should be integrated into the base file.
statements to a modified file and from the comparison, create a third file. The comparison between the base and modified files results in a comparison tree which contains, as nodes, all of the information in the base file as well as the differences located in the modified file. Differences between the nodes of the two files are highlighted in a comparison tree and the user may resolve the differences to create a third file or optionally incorporate the selected differences into the base file. As nodes are examined in the comparison tree and decisions made as to which nodes to include in the third file, differences in the comparison tree are resolved. As a difference is resolved, any node in the comparison tree dependent upon the now resolved difference is no longer highlighted if it too has had the difference resolved. The tool is most commonly used to determine changes made to a source code base file and allows the individual maintaining a stable source code base to determine if the changes in the modified file should be integrated into the base file.
Description
COMPARISON OF HIERARCHICAL STRUCTURES
AND MERGING OF DIFFERENCES
FIELD OF THE INVENTION
The present invention is a tool which compares two hierarchical data structures and produces a third hierarchical data structure indicating the differences between the two input data structures.
The user may then traverse the third data structure and select the nodes of interest to create a new fourth data structure comprising components selected from the first and second data structures, based upon the differences highlighted in the third data structure. The preferred embodiment of the present invention provides this facility for XML files.
BACKGROUND OF THE INVENTION
Data is often modeled using structures based upon hierarchy. For example, an XML
(Extensible Markup Language) document has a tree hierarchy with the nodes being the element tags in the document. When changes are made between versions of an XML document, one may want to understand what the changes were. Also, in a multi-user environment, it is desirable to be able to merge multiple changes to a single document in a controlled manner. Current tools which provide difference comparisons between files at the source level (e.g. UNIX diff) do not recognize the context of a hierarchy. Typically, they simply match strings within flat ASCII
files.
Thus, there is a need for a software tool that will compare differences between hierarchical structures and provide the user with the ability to reconcile and understand the differences, and select which differences should be merged into the controlled base set of documents.
SUMMARY OF THE INVENTION
The present invention provides a method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of comparing the elements of a base file to the elements of a modified file; providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and highlighting the differences between said elements of said base and said modified files.
The method may further comprise the step of allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file. Said step of allowing the user to resolve said differences may include indicating to the user differences between elements by one of the identifiers: new, changed or removed. For an element identified as new, the method may provide the user with the following options: do not use the new element, whereby the new element is not incorporated into said merged file; and use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file. The method may also include, for an element identified as changed, providing the user with the following options: use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any. And, for an element identified as removed, the method may also provide the user with the following options: do not delete, whereby the merged file has the element as it exists in the base file; and delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
The method may also comprise visually displaying the tree structure. The visually displaying of the tree structure may also comprise displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file. Further, the method may include, when the user selects an element of the tree structure displaying in the first pane, displaying the source code for the selected element: in the second pane if the selected element exists in the base file; and in the third pane if the selected element exists in the modified file.
Further, the step of comparing may use an ID attribute of the elements of the base file and the modified file being compared. The step of comparing may also use a name attribute of the elements of the base file and the modified file being compared. Further, the step of comparing may use, when the hierarchically structured files are XML (eXtensible markup language) files, if provided by the elements of the base and modified files being compaxed, an attribute of type ID, or if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared, or if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared, or if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
The hierarchically structured files of the method may be XML (eXtensible Markup Language) files.
There is also provided a method for visually identifying to a user, the differences between elements of a hierarchical base data structure and a hierarchical modified data structure, comprising the steps of: comparing the elements of said base data structure to the elements of said modified data structure; displaying to the user a tree structure, said tree structure combining the elements of said base and modified data structures; and highlighting the differences between said elements of said base and modified data structures.
There is also provided a program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of any of the foregoing method steps.
The present invention also provides a system for identifying to a user, the differences between elements of two hierarchically structured files, comprising means for comparing the elements of a base file to the elements of a modified file; means for providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and means for highlighting the differences between said elements of said base and said modified files.
The system may further comprise means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file. Said means for allowing the user to resolve said differences may include means for indicating to the user differences between elements by one of the identifiers: new, changed or removed. For an element identified as new, the system may provide means for providing the user with the following options: do not use the new element, whereby the new element is not incorporated into said merged file; and use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file. The system may also include, for an element identified as changed, means for providing the user with the following options: use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
And, for an element identified as removed, the system may also include means for providing the user with the following options: do not delete, whereby the merged file has the element as it exists in the base file; and delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
The system may also comprise means for visually displaying the tree structure.
The means for visually displaying of the tree structure may also means for displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file. Further, the system may include, when the user selects an element of the tree structure displaying in the first pane, means for displaying the source code for the selected element: in the second pane if the selected element exists in the base file; and in the third pane if the selected element exists in the modified file.
Further, the means for comparing may use an ID attribute of the elements of the base file and the modified file being compared. The means for comparing may also use a name attribute of the elements of the base file and the modified file being compared. Further, the means for comparing may use, when the hierarchically structured files are XML (eXtensible markup language) files, if provided by the elements of the base and modified files being compared, an attribute of type ID, or if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared, or if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared, or if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
There is also provided a system for determining the differences between two hierarchically structured files comprising a parser to parse the files and produce a parse tree output for each file;
a comparison module to compare the parse trees output from the parser and to create a merged tree from the parse tree outputs; and a tree view module to display the merged tree.
Also, a hierarchical data structure for use by a computer system and stored on a computer-readable storage medium is provided, said structure comprising a plurality of nodes; each of said nodes corresponding to a hierarchical element contained within a base file or a modified file, said files stored within said computer system; and each of said nodes having an indicator if said node is new, changed or removed when comparing the nodes of said base file to said modified file.
DESCRIPTION OF THE DRAWINGS
The present invention is illustrated by way of example and not limitation in the figures of the accompanying drawings in which like references indicate similar or corresponding elements, and in which:
Figure 1 is a schematic diagram illustrating a base file structure tree and a modified file structure tree;
Figure 2 is a schematic diagram illustrating the merged file structure tree resulting from the merging of the two structures represented in Figure 1;
Figure 3 is a screen capture of a user interface illustrating the merged file structure tree of Figure 2, as well as portions of the base file structure tree and modified file structure tree of Figure 1; and Figure 4 is a schematic diagram illustrating the components of a preferred embodiment of the present invention.
DESCRIPTION OF PREFERRED EMBODIMENT
A preferred embodiment of the present invention will be discussed in the context of how it is able to compare and merge XML documents. As can be appreciated by those skilled in the art, the present invention applies equally well to any set of hierarchical data structures.
In the preferred embodiment of the present invention, the hierarchy of an XML
document is viewed as an inverted tree where each node represents an element of the data structure, where the root is the parent of the nodes at the next level, and so on. The rank of a node is its tree level. To each node is assigned an identity that is a function of node's rank, the node order among its siblings and the node's data content. A description of the method of determining identity follows later in this disclosure. A differencing tree is a tree with its identity on a node.
Comparison of structures becomes now a comparison of differencing trees, by concurrently walking the trees performing a match and compare algorithm to find differences between two such trees. The comparison produces a third tree, representing a merging of the initial two structures. In this merged structure, nodes are tagged relative to the first (base) structure and can be of the following types: unchanged, new, removed or changed. The new, removed and changed nodes are also called unresolved nodes.
1 ) Unchanged node: a node with the same identity in both trees, representing identical data in both structures;
AND MERGING OF DIFFERENCES
FIELD OF THE INVENTION
The present invention is a tool which compares two hierarchical data structures and produces a third hierarchical data structure indicating the differences between the two input data structures.
The user may then traverse the third data structure and select the nodes of interest to create a new fourth data structure comprising components selected from the first and second data structures, based upon the differences highlighted in the third data structure. The preferred embodiment of the present invention provides this facility for XML files.
BACKGROUND OF THE INVENTION
Data is often modeled using structures based upon hierarchy. For example, an XML
(Extensible Markup Language) document has a tree hierarchy with the nodes being the element tags in the document. When changes are made between versions of an XML document, one may want to understand what the changes were. Also, in a multi-user environment, it is desirable to be able to merge multiple changes to a single document in a controlled manner. Current tools which provide difference comparisons between files at the source level (e.g. UNIX diff) do not recognize the context of a hierarchy. Typically, they simply match strings within flat ASCII
files.
Thus, there is a need for a software tool that will compare differences between hierarchical structures and provide the user with the ability to reconcile and understand the differences, and select which differences should be merged into the controlled base set of documents.
SUMMARY OF THE INVENTION
The present invention provides a method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of comparing the elements of a base file to the elements of a modified file; providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and highlighting the differences between said elements of said base and said modified files.
The method may further comprise the step of allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file. Said step of allowing the user to resolve said differences may include indicating to the user differences between elements by one of the identifiers: new, changed or removed. For an element identified as new, the method may provide the user with the following options: do not use the new element, whereby the new element is not incorporated into said merged file; and use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file. The method may also include, for an element identified as changed, providing the user with the following options: use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any. And, for an element identified as removed, the method may also provide the user with the following options: do not delete, whereby the merged file has the element as it exists in the base file; and delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
The method may also comprise visually displaying the tree structure. The visually displaying of the tree structure may also comprise displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file. Further, the method may include, when the user selects an element of the tree structure displaying in the first pane, displaying the source code for the selected element: in the second pane if the selected element exists in the base file; and in the third pane if the selected element exists in the modified file.
Further, the step of comparing may use an ID attribute of the elements of the base file and the modified file being compared. The step of comparing may also use a name attribute of the elements of the base file and the modified file being compared. Further, the step of comparing may use, when the hierarchically structured files are XML (eXtensible markup language) files, if provided by the elements of the base and modified files being compaxed, an attribute of type ID, or if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared, or if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared, or if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
The hierarchically structured files of the method may be XML (eXtensible Markup Language) files.
There is also provided a method for visually identifying to a user, the differences between elements of a hierarchical base data structure and a hierarchical modified data structure, comprising the steps of: comparing the elements of said base data structure to the elements of said modified data structure; displaying to the user a tree structure, said tree structure combining the elements of said base and modified data structures; and highlighting the differences between said elements of said base and modified data structures.
There is also provided a program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of any of the foregoing method steps.
The present invention also provides a system for identifying to a user, the differences between elements of two hierarchically structured files, comprising means for comparing the elements of a base file to the elements of a modified file; means for providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and means for highlighting the differences between said elements of said base and said modified files.
The system may further comprise means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file. Said means for allowing the user to resolve said differences may include means for indicating to the user differences between elements by one of the identifiers: new, changed or removed. For an element identified as new, the system may provide means for providing the user with the following options: do not use the new element, whereby the new element is not incorporated into said merged file; and use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file. The system may also include, for an element identified as changed, means for providing the user with the following options: use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
And, for an element identified as removed, the system may also include means for providing the user with the following options: do not delete, whereby the merged file has the element as it exists in the base file; and delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
The system may also comprise means for visually displaying the tree structure.
The means for visually displaying of the tree structure may also means for displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file. Further, the system may include, when the user selects an element of the tree structure displaying in the first pane, means for displaying the source code for the selected element: in the second pane if the selected element exists in the base file; and in the third pane if the selected element exists in the modified file.
Further, the means for comparing may use an ID attribute of the elements of the base file and the modified file being compared. The means for comparing may also use a name attribute of the elements of the base file and the modified file being compared. Further, the means for comparing may use, when the hierarchically structured files are XML (eXtensible markup language) files, if provided by the elements of the base and modified files being compared, an attribute of type ID, or if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared, or if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared, or if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
There is also provided a system for determining the differences between two hierarchically structured files comprising a parser to parse the files and produce a parse tree output for each file;
a comparison module to compare the parse trees output from the parser and to create a merged tree from the parse tree outputs; and a tree view module to display the merged tree.
Also, a hierarchical data structure for use by a computer system and stored on a computer-readable storage medium is provided, said structure comprising a plurality of nodes; each of said nodes corresponding to a hierarchical element contained within a base file or a modified file, said files stored within said computer system; and each of said nodes having an indicator if said node is new, changed or removed when comparing the nodes of said base file to said modified file.
DESCRIPTION OF THE DRAWINGS
The present invention is illustrated by way of example and not limitation in the figures of the accompanying drawings in which like references indicate similar or corresponding elements, and in which:
Figure 1 is a schematic diagram illustrating a base file structure tree and a modified file structure tree;
Figure 2 is a schematic diagram illustrating the merged file structure tree resulting from the merging of the two structures represented in Figure 1;
Figure 3 is a screen capture of a user interface illustrating the merged file structure tree of Figure 2, as well as portions of the base file structure tree and modified file structure tree of Figure 1; and Figure 4 is a schematic diagram illustrating the components of a preferred embodiment of the present invention.
DESCRIPTION OF PREFERRED EMBODIMENT
A preferred embodiment of the present invention will be discussed in the context of how it is able to compare and merge XML documents. As can be appreciated by those skilled in the art, the present invention applies equally well to any set of hierarchical data structures.
In the preferred embodiment of the present invention, the hierarchy of an XML
document is viewed as an inverted tree where each node represents an element of the data structure, where the root is the parent of the nodes at the next level, and so on. The rank of a node is its tree level. To each node is assigned an identity that is a function of node's rank, the node order among its siblings and the node's data content. A description of the method of determining identity follows later in this disclosure. A differencing tree is a tree with its identity on a node.
Comparison of structures becomes now a comparison of differencing trees, by concurrently walking the trees performing a match and compare algorithm to find differences between two such trees. The comparison produces a third tree, representing a merging of the initial two structures. In this merged structure, nodes are tagged relative to the first (base) structure and can be of the following types: unchanged, new, removed or changed. The new, removed and changed nodes are also called unresolved nodes.
1 ) Unchanged node: a node with the same identity in both trees, representing identical data in both structures;
2) New node: a node whose identity cannot be found in the first tree; the data it represents only appears in the second structure;
3) Removed node: a node whose identity cannot be found in the second tree; the data it represents only appears in the first structure; and
4) Changed node: a node with the same identity in both trees, having data that is different between the two structures.
Note that if a node is new, removed or changed, then its parent (and its parent, and so on up the hierarchy) is unresolved.
The second part of the comparison process is the merging of differences. This is accomplished by the user selecting nodes that show differences (i.e. nodes that are tagged as new, removed or changed). The goal is to resolve differences at each changed, new, or removed node, by choosing to select data from either of the two structures being compared, and incorporating the selected data into a merged structure. In this context, a user can equally be a human operator, another software tool, a hardware device or any other means for providing the input required for the invention including the selection of nodes and/or the provision of the structures.
When the user makes a decision as to whether to include or exclude an unresolved node in the hierarchy of the merged structure, changes are propagated down to the child nodes, as if a similar decision has been made on each child node in the substructure. This propagation is also sent up the hierarchy to all the parents of the current node, so that when the parent has no unresolved children then the parent becomes resolved, and then the same procedure applies to the parent of the parent, and so on.
Referring now to Figure 1, a user has edited a base file named "PersonFile.xml", having base file structure tree 10. The editing created a modified file named PersonFile 1.XML, having modified file structure tree 20. The editing involved removing the attribute 'address' 12 and changing the 'type' 14 of element 'age' 16 from long to short (not shown).
Figure 1 illustrates the trees representing the structure of the two XML
files. Note that not all of the data is explicitly shown, but rather only the node structure.
After determining the differences between base file structure tree 10 and modified file structure tree 20, the resulting new tree is shown in Figure 2 as merged file structure tree 30. The unresolved nodes have a crossbar (an X). The nodes without the NEW (not shown), CHANGED, or REMOVED indicators are unchanged. An XML file contains a plurality of elements that can be equated to a node in a tree. Each node or element may have zero or more elements. Thus the XML
statement <Attribute type = "integer"> defines an element named "attribute"
having a single attribute, named "type". The value of the attribute "type" is "integer". As can be seen in Figure 2, removal of the attribute 'address' is shown by crossbars next to the <Attribute Name=address> node and its child nodes along with an indication that those nodes are "REMOVED".
Crossbars are also propagated to the parent nodes to indicate that those nodes are unresolved because a child node - in this case, the <Attribute Name=address> node - is unresolved. Further, the change of 'type' of element 'age' from long to short is shown by a crossbar next to the <Type>
node underneath the <Attribute Name=age> node along with an indication that that node is "CHANGED". Crossbars are also propagated to the parent nodes of that <Type> node to indicate that those parent nodes are unresolved also because a child node is unresolved (although such a propagation is redundant in this case due to the previous propagation).
The simplest usage of the preferred embodiment of the present invention is to visualize the differences between the structure of two XML files, as illustrated in the merged file structure tree 30. However, the most useful feature is to merge the differences into a new XML file as directed by the user.
The preferred embodiment of the present invention does not function at file level, but rather at a higher level, the XML element level. The invention displays a "merged"
tree, in which all the elements of the two input files are shown in a hierarchical tree display with the modified nodes tagged appropriately. For example, if an interface had one attribute in the first XML file, but there is a new attribute added in the second file, the interface node would be marked as changed, and it will contain two child nodes, one for each attribute, with one node being unchanged, and the other marked as new. The user may then traverse the changed nodes and make a decision whether the change should be picked from the base file or from the modified file. Each node in the tree will have an associated pop-up menu (the menu bar can also be used) to allow the user to perform the desired action. The changes will be automatically propagated up and down the tree, so that the user won't need to individually go to each node if a global decision can be made. For example, if a new node was selected as to be part of the merged file, then all its children will also be in the merged file; in addition, if this was the only node with a conflict under its parent, then the parent would be marked as resolved, and so on. The user has also the ability to undo repeatedly, to the last time the work was saved.
Figure 3 is a screen capture of a user interface illustrating the merged file structure tree of Figure 2, as well as portions of the base file structure tree and modified file structure tree of Figure 1. In the left pane of Figure 3, the merged file structure tree 30 contains the differences in the XML
elements of base file structure tree 10 and modified file structure tree 20, as determined by a comparison of the base file structure tree 10 to the modified file structure tree 20. In the preferred embodiment the removed nodes are colored in red, the changed nodes in magenta and the new nodes in blue. Everything else is black. All the modified nodes receive a crossbar X
as a node icon. After the user decides on which version of the node contents to select, the crossbar is replaced by a blue checkmark. Nodes with checkmarks (e.g. UUID node 31) will no longer have the pop-up menu available. The user can undo the changes at any time. Optionally, the user can selectively undo certain changes.
The right panes of Figure 3 show the content of a XML node selected from the left pane, in this case the content of the element 'age' 16. The top pane 40 displays the content of the element 'age' 16 as it appears in the source code of the base file, the bottom pane 50 is for the same element in the modified file. As shown base attribute 42 in top pane 40 has a type of short, while modified attribute 52 has a type of long. Both tags 42 and 52 are part of element 'age' 16 and have different values, thus the reason for the crossbar X, and highlighting of changed type attribute 32 in merged file structure tree 30. When the node selected is a new or deleted node, only one of the two panes will have content.
When the user exits the application (or at any time when clicking on the save button/menu item) the merged changes are written to a specified XML file. Changes that were not resolved (i.e.
nodes with an X) will be resolved as in the base file.
Once the user has a display of the combined XML files as shown in merged file structure tree 30 of Figure 3, the user may traverse the changed nodes and decide whether the change should be incorporated in a new merged file from either the base file, or the modified file.
Every modified node in the merged file structure tree 30 has an associated pop-up menu 34, that provides choices that enable the user to implement the decision whether to incorporate properties from either the base file, or the modified file.
A new node has the following pop-up menu choices:
1) Do not use new: the new node is not incorporated in the merged file; and 2) Use new element: the merged file incorporates the new node, and its children, if any, as they are in the modified file.
A removed node (e.g. removed node 36) has the following pop-up menu choices:
1 ) Do not delete: the merged file incorporates the node as it exists in the base file; and 2) Delete from base file: the merged file does not incorporate the node that was deleted from the base file.
A changed node (e.g. element 'age' 16) has the following pop-up menu choices:
1 ) Use old, where conflict: the merged file incorporates the node as it exists in the base file for the current node, and any of its unresolved children (those modified child nodes for which the user has not made a decision about incorporation in the merged file yet);
and 2) Use new, where conflict: the merged file incorporates the node as it exists in the modified file for the current node, and any of its unresolved children.
The above listed choices are also available from the Selected menu.
To merge the two XML files, the user executes the following steps:
1) Select one of the highlighted nodes in the merged file structure tree 30.
2) Select Use modified (new) file for node and unresolved children from the pop-up menu of the node if the user wants to have the merged file incorporate the changes that were made in the modified XML file. Select Use base (old) file for node and unresolved children from the pop-up menu of the node if the user wants to have the merged file have the older or base version of the corresponding node.
3 ) Use Edit - Undo to undo all of the users actions up to the last time the user saved their work.
When comparing XML files, the user selects the base and the modified XML
files. Using an XML parser the two files are parsed and the two parse trees obtained. Each node in the tree corresponds to an element in the XML document.
The two trees are being walked in parallel, starting from the root and at each level nodes are matched from the two trees and added to a merged tree (or comparison tree) and tagged appropriately (new, removed, changed, same).
The identity function is based on the node's position in the tree, its ID
attributes or its direct content. The identity function can be anything the user wants and can be customized. In the preferred embodiment of the present invention, the identity function is designed to uniquely identify XML
elements. The tool determines the identity of a node by examining certain attributes in the following manner.
A tree (representing an XML file structure) is a tree of XML elements, each element having zero or more attributes. Firstly, all the attributes of an element are examined to determine whether there is any attribute of type ID. XML defines a type ID for an attribute and a valid XML document should enforce that no two elements have attributes with the same ID, i.e. the values of the ID
attributes must be unique in an XML document. If such an ID attribute is found, then the identity is the value of the attribute (guaranteed to be unique in that document). If, there is no ID attribute, the direct children of this node are examined and checked to determine whether there is one with a tag called <Uuid>. If one is found, then its value is taken (i.e. the text content of the Uuid element, which is an Open Software Foundation's Distributed Computing Environment (DCE) compliant universally unique identifier) and used as the node identity.
If none of the above is successful, look for an attribute of the element represented by the node with a name equal to "Name". If one is found, use it as the node identity.
Last, if none of the above steps provide a node identity, then take the text contained within this element, and concatenate it with the element tag and use it as the identity of the node. The tag is the name of the element e.g. in <Title>My Book</Title>, the tag name is "Title".
To allow for different ordering of nodes within a level, the dependency of the order among siblings may be ignored in identity, in which case an assumption is made that the node's data is different among sibling nodes.
The following algorithm is used to construct the merged file structure tree 30:
Rootl = root of the base tree Root2 = root of the modified tree Root3 = new root for merged tree Compare (rood, root2, root3):
For each child of root 1 {
If there is no child of root2 with the same identity then add this child to root3 and tag it as REMOVED.
Then add the whole subtree rooted at this child to the merged tree and mark all the nodes as REMOVED (since their parent node was removed).
} Else {
If there is a child of root2 with same identity then check the content of the two child nodes (XML attributes and text).
If there are differences, mark the root 1 child node as changed (i.e. children changed) and add it to the merged tree.
}
Once all the children of the rootl have been examined the roles are reversed and each child of root2 is examined to determine if it appears as a child of the root 1 node (i.e. root 1 has a child with the same identity). Those that are not found are marked as NEW and added to the merged tree. Also, the subtrees rooted at these nodes are added (and tagged as NEW) to the merged tree.
When all the children of rootl and root2 have been examined, the trees are recursively traversed using the same process to ensure that any descendants that may have been changed, removed or new are also identified.
The recursion algorithm is as follows:
For each childl of rood For each child2 of root2 For each node added in the merged tree (caused by comparing childl and child2) Compare (childl, child2, node) Referring now to Figure 4, a schematic diagram illustrating the components of the preferred embodiment of the present invention. The preferred embodiment of the present invention shown generally as 60 comprises a main tool 62 which coordinates the comparison and display of the input files 64. Main tool 62 first passes each of the two input files 64 to the XML
parser 66. As recognized by one skilled in the art, the use of the XML parser 66 is based solely upon the fact that for the purposes of this embodiment the input files 64 comprise XML source code. The XML parser 66 produces as output a parse tree 68 for each of the input files 64. Once the parsing of the input files 64 is completed, the main tool 62 invokes the comparison module 70 to compare the contents of the parse trees 68. The comparison module 70 then creates a merged tree 72 combining the elements of the two parse trees 68. The tree view module 74 then displays the merged tree 72 in the format illustrated in Figure 3. The user 76 then interacts with the tree view 74 as shown in Figure 3 to determine which elements of the merged tree 72 are to be selected to create the output merged file 78. As is readily apparent to those skilled in the art, any or all of these components may be integrated into one tool or may each be separate tools that are interconnected or stand-alone.
The XML parser 66 has a digest function which encodes all of the information about an XML
element and all of its descendants. This digest function can be used to determine whether two elements are identical or not. This aids in identifying changed elements even though they appear to be the same when their attributes are initially examined. As discussed, a changed node is caused by either changes to the attributes of an element or changes to one of its descendants. Thus, although a change will always be identified, the ability to recognize a change at a higher level of the tree allows an element to be identified as changed at that point.
The invention may be implemented on a stand-alone basis, integrated into an application wherein the invention is a feature such as an integrated software development environment or integrated into an application to further process the results of the analysis and/or provide the variable inputs including the trees to be analyzed or the decisions on whether to incorporate into a merged file elements) from the base file or from the modified file.
The invention may be implemented as a program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of the invention. Such a program storage device may include diskettes, optical discs, tapes, CD-ROMS, hard drives, memory including ROM or RAM, computer tapes or other storage media capable of storing a computer program.
The invention may also be implemented in a computer system. In a preferred embodiment, a system is provided comprising a computer program operating on a data processing system, with the computer program embodying the method of the invention and producing an output of the method on a display or output device. Data processing systems include computers, computer networks, embedded systems and other systems capable of executing a computer program. A
computer includes a processor and a memory device and optionally, a storage device, a video display and/or an input device. Computers may equally be in stand-alone form (such as the traditional desktop personal computer) or integrated into another apparatus (such as a cellular telephone).
While this invention has been described in relation to preferred embodiments, it will be understood by those skilled in the art that changes in the details of processes and structures may be made without departing from the spirit and scope of this invention. Many modifications and variations are possible in light of the above teaching. Thus, it should be understood that the above described embodiments have been provided by way of example rather than as a limitation and that the specification and drawing are, accordingly, to be regarded in an illustrative rather than a restrictive sense.
Note that if a node is new, removed or changed, then its parent (and its parent, and so on up the hierarchy) is unresolved.
The second part of the comparison process is the merging of differences. This is accomplished by the user selecting nodes that show differences (i.e. nodes that are tagged as new, removed or changed). The goal is to resolve differences at each changed, new, or removed node, by choosing to select data from either of the two structures being compared, and incorporating the selected data into a merged structure. In this context, a user can equally be a human operator, another software tool, a hardware device or any other means for providing the input required for the invention including the selection of nodes and/or the provision of the structures.
When the user makes a decision as to whether to include or exclude an unresolved node in the hierarchy of the merged structure, changes are propagated down to the child nodes, as if a similar decision has been made on each child node in the substructure. This propagation is also sent up the hierarchy to all the parents of the current node, so that when the parent has no unresolved children then the parent becomes resolved, and then the same procedure applies to the parent of the parent, and so on.
Referring now to Figure 1, a user has edited a base file named "PersonFile.xml", having base file structure tree 10. The editing created a modified file named PersonFile 1.XML, having modified file structure tree 20. The editing involved removing the attribute 'address' 12 and changing the 'type' 14 of element 'age' 16 from long to short (not shown).
Figure 1 illustrates the trees representing the structure of the two XML
files. Note that not all of the data is explicitly shown, but rather only the node structure.
After determining the differences between base file structure tree 10 and modified file structure tree 20, the resulting new tree is shown in Figure 2 as merged file structure tree 30. The unresolved nodes have a crossbar (an X). The nodes without the NEW (not shown), CHANGED, or REMOVED indicators are unchanged. An XML file contains a plurality of elements that can be equated to a node in a tree. Each node or element may have zero or more elements. Thus the XML
statement <Attribute type = "integer"> defines an element named "attribute"
having a single attribute, named "type". The value of the attribute "type" is "integer". As can be seen in Figure 2, removal of the attribute 'address' is shown by crossbars next to the <Attribute Name=address> node and its child nodes along with an indication that those nodes are "REMOVED".
Crossbars are also propagated to the parent nodes to indicate that those nodes are unresolved because a child node - in this case, the <Attribute Name=address> node - is unresolved. Further, the change of 'type' of element 'age' from long to short is shown by a crossbar next to the <Type>
node underneath the <Attribute Name=age> node along with an indication that that node is "CHANGED". Crossbars are also propagated to the parent nodes of that <Type> node to indicate that those parent nodes are unresolved also because a child node is unresolved (although such a propagation is redundant in this case due to the previous propagation).
The simplest usage of the preferred embodiment of the present invention is to visualize the differences between the structure of two XML files, as illustrated in the merged file structure tree 30. However, the most useful feature is to merge the differences into a new XML file as directed by the user.
The preferred embodiment of the present invention does not function at file level, but rather at a higher level, the XML element level. The invention displays a "merged"
tree, in which all the elements of the two input files are shown in a hierarchical tree display with the modified nodes tagged appropriately. For example, if an interface had one attribute in the first XML file, but there is a new attribute added in the second file, the interface node would be marked as changed, and it will contain two child nodes, one for each attribute, with one node being unchanged, and the other marked as new. The user may then traverse the changed nodes and make a decision whether the change should be picked from the base file or from the modified file. Each node in the tree will have an associated pop-up menu (the menu bar can also be used) to allow the user to perform the desired action. The changes will be automatically propagated up and down the tree, so that the user won't need to individually go to each node if a global decision can be made. For example, if a new node was selected as to be part of the merged file, then all its children will also be in the merged file; in addition, if this was the only node with a conflict under its parent, then the parent would be marked as resolved, and so on. The user has also the ability to undo repeatedly, to the last time the work was saved.
Figure 3 is a screen capture of a user interface illustrating the merged file structure tree of Figure 2, as well as portions of the base file structure tree and modified file structure tree of Figure 1. In the left pane of Figure 3, the merged file structure tree 30 contains the differences in the XML
elements of base file structure tree 10 and modified file structure tree 20, as determined by a comparison of the base file structure tree 10 to the modified file structure tree 20. In the preferred embodiment the removed nodes are colored in red, the changed nodes in magenta and the new nodes in blue. Everything else is black. All the modified nodes receive a crossbar X
as a node icon. After the user decides on which version of the node contents to select, the crossbar is replaced by a blue checkmark. Nodes with checkmarks (e.g. UUID node 31) will no longer have the pop-up menu available. The user can undo the changes at any time. Optionally, the user can selectively undo certain changes.
The right panes of Figure 3 show the content of a XML node selected from the left pane, in this case the content of the element 'age' 16. The top pane 40 displays the content of the element 'age' 16 as it appears in the source code of the base file, the bottom pane 50 is for the same element in the modified file. As shown base attribute 42 in top pane 40 has a type of short, while modified attribute 52 has a type of long. Both tags 42 and 52 are part of element 'age' 16 and have different values, thus the reason for the crossbar X, and highlighting of changed type attribute 32 in merged file structure tree 30. When the node selected is a new or deleted node, only one of the two panes will have content.
When the user exits the application (or at any time when clicking on the save button/menu item) the merged changes are written to a specified XML file. Changes that were not resolved (i.e.
nodes with an X) will be resolved as in the base file.
Once the user has a display of the combined XML files as shown in merged file structure tree 30 of Figure 3, the user may traverse the changed nodes and decide whether the change should be incorporated in a new merged file from either the base file, or the modified file.
Every modified node in the merged file structure tree 30 has an associated pop-up menu 34, that provides choices that enable the user to implement the decision whether to incorporate properties from either the base file, or the modified file.
A new node has the following pop-up menu choices:
1) Do not use new: the new node is not incorporated in the merged file; and 2) Use new element: the merged file incorporates the new node, and its children, if any, as they are in the modified file.
A removed node (e.g. removed node 36) has the following pop-up menu choices:
1 ) Do not delete: the merged file incorporates the node as it exists in the base file; and 2) Delete from base file: the merged file does not incorporate the node that was deleted from the base file.
A changed node (e.g. element 'age' 16) has the following pop-up menu choices:
1 ) Use old, where conflict: the merged file incorporates the node as it exists in the base file for the current node, and any of its unresolved children (those modified child nodes for which the user has not made a decision about incorporation in the merged file yet);
and 2) Use new, where conflict: the merged file incorporates the node as it exists in the modified file for the current node, and any of its unresolved children.
The above listed choices are also available from the Selected menu.
To merge the two XML files, the user executes the following steps:
1) Select one of the highlighted nodes in the merged file structure tree 30.
2) Select Use modified (new) file for node and unresolved children from the pop-up menu of the node if the user wants to have the merged file incorporate the changes that were made in the modified XML file. Select Use base (old) file for node and unresolved children from the pop-up menu of the node if the user wants to have the merged file have the older or base version of the corresponding node.
3 ) Use Edit - Undo to undo all of the users actions up to the last time the user saved their work.
When comparing XML files, the user selects the base and the modified XML
files. Using an XML parser the two files are parsed and the two parse trees obtained. Each node in the tree corresponds to an element in the XML document.
The two trees are being walked in parallel, starting from the root and at each level nodes are matched from the two trees and added to a merged tree (or comparison tree) and tagged appropriately (new, removed, changed, same).
The identity function is based on the node's position in the tree, its ID
attributes or its direct content. The identity function can be anything the user wants and can be customized. In the preferred embodiment of the present invention, the identity function is designed to uniquely identify XML
elements. The tool determines the identity of a node by examining certain attributes in the following manner.
A tree (representing an XML file structure) is a tree of XML elements, each element having zero or more attributes. Firstly, all the attributes of an element are examined to determine whether there is any attribute of type ID. XML defines a type ID for an attribute and a valid XML document should enforce that no two elements have attributes with the same ID, i.e. the values of the ID
attributes must be unique in an XML document. If such an ID attribute is found, then the identity is the value of the attribute (guaranteed to be unique in that document). If, there is no ID attribute, the direct children of this node are examined and checked to determine whether there is one with a tag called <Uuid>. If one is found, then its value is taken (i.e. the text content of the Uuid element, which is an Open Software Foundation's Distributed Computing Environment (DCE) compliant universally unique identifier) and used as the node identity.
If none of the above is successful, look for an attribute of the element represented by the node with a name equal to "Name". If one is found, use it as the node identity.
Last, if none of the above steps provide a node identity, then take the text contained within this element, and concatenate it with the element tag and use it as the identity of the node. The tag is the name of the element e.g. in <Title>My Book</Title>, the tag name is "Title".
To allow for different ordering of nodes within a level, the dependency of the order among siblings may be ignored in identity, in which case an assumption is made that the node's data is different among sibling nodes.
The following algorithm is used to construct the merged file structure tree 30:
Rootl = root of the base tree Root2 = root of the modified tree Root3 = new root for merged tree Compare (rood, root2, root3):
For each child of root 1 {
If there is no child of root2 with the same identity then add this child to root3 and tag it as REMOVED.
Then add the whole subtree rooted at this child to the merged tree and mark all the nodes as REMOVED (since their parent node was removed).
} Else {
If there is a child of root2 with same identity then check the content of the two child nodes (XML attributes and text).
If there are differences, mark the root 1 child node as changed (i.e. children changed) and add it to the merged tree.
}
Once all the children of the rootl have been examined the roles are reversed and each child of root2 is examined to determine if it appears as a child of the root 1 node (i.e. root 1 has a child with the same identity). Those that are not found are marked as NEW and added to the merged tree. Also, the subtrees rooted at these nodes are added (and tagged as NEW) to the merged tree.
When all the children of rootl and root2 have been examined, the trees are recursively traversed using the same process to ensure that any descendants that may have been changed, removed or new are also identified.
The recursion algorithm is as follows:
For each childl of rood For each child2 of root2 For each node added in the merged tree (caused by comparing childl and child2) Compare (childl, child2, node) Referring now to Figure 4, a schematic diagram illustrating the components of the preferred embodiment of the present invention. The preferred embodiment of the present invention shown generally as 60 comprises a main tool 62 which coordinates the comparison and display of the input files 64. Main tool 62 first passes each of the two input files 64 to the XML
parser 66. As recognized by one skilled in the art, the use of the XML parser 66 is based solely upon the fact that for the purposes of this embodiment the input files 64 comprise XML source code. The XML parser 66 produces as output a parse tree 68 for each of the input files 64. Once the parsing of the input files 64 is completed, the main tool 62 invokes the comparison module 70 to compare the contents of the parse trees 68. The comparison module 70 then creates a merged tree 72 combining the elements of the two parse trees 68. The tree view module 74 then displays the merged tree 72 in the format illustrated in Figure 3. The user 76 then interacts with the tree view 74 as shown in Figure 3 to determine which elements of the merged tree 72 are to be selected to create the output merged file 78. As is readily apparent to those skilled in the art, any or all of these components may be integrated into one tool or may each be separate tools that are interconnected or stand-alone.
The XML parser 66 has a digest function which encodes all of the information about an XML
element and all of its descendants. This digest function can be used to determine whether two elements are identical or not. This aids in identifying changed elements even though they appear to be the same when their attributes are initially examined. As discussed, a changed node is caused by either changes to the attributes of an element or changes to one of its descendants. Thus, although a change will always be identified, the ability to recognize a change at a higher level of the tree allows an element to be identified as changed at that point.
The invention may be implemented on a stand-alone basis, integrated into an application wherein the invention is a feature such as an integrated software development environment or integrated into an application to further process the results of the analysis and/or provide the variable inputs including the trees to be analyzed or the decisions on whether to incorporate into a merged file elements) from the base file or from the modified file.
The invention may be implemented as a program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of the invention. Such a program storage device may include diskettes, optical discs, tapes, CD-ROMS, hard drives, memory including ROM or RAM, computer tapes or other storage media capable of storing a computer program.
The invention may also be implemented in a computer system. In a preferred embodiment, a system is provided comprising a computer program operating on a data processing system, with the computer program embodying the method of the invention and producing an output of the method on a display or output device. Data processing systems include computers, computer networks, embedded systems and other systems capable of executing a computer program. A
computer includes a processor and a memory device and optionally, a storage device, a video display and/or an input device. Computers may equally be in stand-alone form (such as the traditional desktop personal computer) or integrated into another apparatus (such as a cellular telephone).
While this invention has been described in relation to preferred embodiments, it will be understood by those skilled in the art that changes in the details of processes and structures may be made without departing from the spirit and scope of this invention. Many modifications and variations are possible in light of the above teaching. Thus, it should be understood that the above described embodiments have been provided by way of example rather than as a limitation and that the specification and drawing are, accordingly, to be regarded in an illustrative rather than a restrictive sense.
Claims (31)
1. A method for identifying to a user, the differences between elements of two hierarchically structured files, comprising the steps of:
comparing the elements of a base file to the elements of a modified file;
providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and highlighting the differences between said elements of said base and said modified files.
comparing the elements of a base file to the elements of a modified file;
providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and highlighting the differences between said elements of said base and said modified files.
2. The method of claim 1 further comprising the step of allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file.
3. The method of claim 2 which includes indicating to the user differences between elements by one of the identifiers: new, changed or removed.
4. The method of claim 3 which includes, for an element identified as new, providing the user with the following options:
a) do not use the new element, whereby the new element is not incorporated into said merged file; and b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.
a) do not use the new element, whereby the new element is not incorporated into said merged file; and b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.
5. The method of claim 3 or claim 4 which includes, for an element identified as changed, providing the user with the following options:
a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
6. The method of any one of claims 3 to 5, which includes, for an element identified as removed, providing the user with the following options:
a) do not delete, whereby the merged file has the element as it exists in the base file; and b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
a) do not delete, whereby the merged file has the element as it exists in the base file; and b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
7. The method of any one of claims 1 to 6 wherein the step of providing to user a tree structure comprises visually displaying the tree structure.
8. The method of claim 7 wherein visually displaying the tree structure comprises displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file.
9. The method of claim 8 which includes, when the user selects an element of the tree structure displayed in the first pane, displaying the source code for the selected element:
a) in the second pane if the selected element exists in the base file; and b) in the third pane if the selected element exists in the modified file.
a) in the second pane if the selected element exists in the base file; and b) in the third pane if the selected element exists in the modified file.
10. The method of any one of claims 1 to 9 wherein the step of comparing uses an ID attribute of the elements of the base file and the modified file being compared.
11. The method of any one of claims 1 to 10 wherein the step of comparing uses a name attribute of the elements of the base file and the modified file being compared.
12. The method of any one of claims 1 to 9 wherein said hierarchically structured files are XML
(eXtensible markup language) files and wherein the step of comparing uses:
if provided by the elements of the base and modified files being compared, an attribute of type ID;
if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared;
if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
(eXtensible markup language) files and wherein the step of comparing uses:
if provided by the elements of the base and modified files being compared, an attribute of type ID;
if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared;
if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
13. The method of any one of claims 1 to 12 wherein said hierarchically structured files are XML (eXtensible Markup Language) files.
14. A method for visually identifying to a user, the differences between elements of a hierarchical base data structure and a hierarchical modified data structure, comprising the steps of:
comparing the elements of said base data structure to the elements of said modified data structure;
displaying to the user a tree structure, said tree structure combining the elements of said base and modified data structures; and highlighting the differences between said elements of said base and modified data structures.
comparing the elements of said base data structure to the elements of said modified data structure;
displaying to the user a tree structure, said tree structure combining the elements of said base and modified data structures; and highlighting the differences between said elements of said base and modified data structures.
15. A program storage device readable by a data processing system, tangibly embodying a program of instructions, executable by said data processing system to perform the method steps of any one of claims 1 to 14.
16. A system for identifying to a user, the differences between elements of two hierarchically structured files, comprising:
means for comparing the elements of a base file to the elements of a modified file;
means for providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and means for highlighting the differences between said elements of said base and said modified files.
means for comparing the elements of a base file to the elements of a modified file;
means for providing to the user a tree structure, said tree structure combining the elements of said base and said modified files; and means for highlighting the differences between said elements of said base and said modified files.
17. The system of claim 16 further comprising means for allowing the user to resolve said differences between elements, thereby creating a merged file containing elements from said base file and elements from said modified file.
18. The system of claim 17 which includes means for indicating to the user differences between elements by one of the identifiers: new, changed or removed.
19. The system of claim 18 which includes, for an element identified as new, providing the user with the following options:
a) do not use the new element, whereby the new element is not incorporated into said merged file; and b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.
a) do not use the new element, whereby the new element is not incorporated into said merged file; and b) use the new element, whereby the new element and children thereof, if any, are incorporated into said merged file.
20. The system of claim 18 or claim 19 which includes, for an element identified as changed, means for providing the user with the following options:
a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
a) use old, where conflict, whereby for the merged file the changed element is taken from the base file together with unresolved children thereof, if any; and b) use new, where conflict, whereby for the merged file the changed element is taken from the modified file together with unresolved children thereof, if any.
21. The system of any one of claims 18 to 20, which includes, for an element identified as removed, means for providing the user with the following options:
a) do not delete, whereby the merged file has the element as it exists in the base file; and b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
a) do not delete, whereby the merged file has the element as it exists in the base file; and b) delete from the base file, whereby the merged file does not have the element that was deleted from the base file.
22. The system of any one of claims 16 to 21 wherein the means for providing to user a tree structure comprises means for visually displaying the tree structure.
23. The system of claim 22 wherein the means for visually displaying the tree structure comprises means for displaying to the user a screen containing three panes, the first pane displaying said tree structure, the second pane displaying an element of said base file, and the third pane displaying an element of the modified file.
24. The system of claim 23 which includes, when the user selects an element of the tree structure displayed in the first pane, means for displaying the source code for the selected element:
a) in the second pane if the selected element exists in the base file; and b) in the third pane if the selected element exists in the modified file.
a) in the second pane if the selected element exists in the base file; and b) in the third pane if the selected element exists in the modified file.
25. The system of any one of claims 16 to 24 wherein the means for comparing uses an ID
attribute of the elements of the base file and the modified file being compared.
attribute of the elements of the base file and the modified file being compared.
26. The system of any one of claims 16 to 25 wherein the means for comparing uses a name attribute of the elements of the base file and the modified file being compared.
27. The system of any one of claims 16 to 24 wherein said hierarchically structured files are XML (eXtensible markup language) files and wherein the means for comparing uses:
if provided by the elements of the base and modified files being compared, an attribute of type ID;
if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared;
if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
if provided by the elements of the base and modified files being compared, an attribute of type ID;
if an attribute of type ID is not provided by the elements of the base and modified files being compared, a <Uuid> tag if provided by the elements of the base and modified files being compared;
if an attribute of type ID and a <Uuid> tag is not provided by the elements of the base and modified files being compared, a name attribute if provided by the elements of the base and modified files being compared; and if an attribute of type ID, a <Uuid> tag and a name attribute is not provided by the elements of the base and modified files being compared, a concatenation of a tag of the element and a value of the element.
28. The system of any one of claims 16 to 27 wherein said hierarchically structured files are XML (eXtensible Markup Language) files.
29. A system for determining the differences between two hierarchically structured files comprising:
a parser to parse the files and produce a parse tree output for each file; and a comparison module to compare the parse trees output from the parser and to create a merged tree from the parse tree outputs;
a parser to parse the files and produce a parse tree output for each file; and a comparison module to compare the parse trees output from the parser and to create a merged tree from the parse tree outputs;
30. The system of claim 29, further comprising a tree view module to display the merged tree.
31. A hierarchical data structure for use by a computer system and stored on a computer-readable storage medium, said structure comprising:
a plurality of nodes;
each of said nodes corresponding to a hierarchical element contained within a base file or a modified file, said files stored within said computer system; and each of said nodes having an indicator if said node is new, changed or removed when comparing the nodes of said base file to said modified file.
a plurality of nodes;
each of said nodes corresponding to a hierarchical element contained within a base file or a modified file, said files stored within said computer system; and each of said nodes having an indicator if said node is new, changed or removed when comparing the nodes of said base file to said modified file.
Priority Applications (2)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CA002255047A CA2255047A1 (en) | 1998-11-30 | 1998-11-30 | Comparison of hierarchical structures and merging of differences |
| US09/437,619 US6848078B1 (en) | 1998-11-30 | 1999-11-10 | Comparison of hierarchical structures and merging of differences |
Applications Claiming Priority (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CA002255047A CA2255047A1 (en) | 1998-11-30 | 1998-11-30 | Comparison of hierarchical structures and merging of differences |
Publications (1)
| Publication Number | Publication Date |
|---|---|
| CA2255047A1 true CA2255047A1 (en) | 2000-05-30 |
Family
ID=29425750
Family Applications (1)
| Application Number | Title | Priority Date | Filing Date |
|---|---|---|---|
| CA002255047A Abandoned CA2255047A1 (en) | 1998-11-30 | 1998-11-30 | Comparison of hierarchical structures and merging of differences |
Country Status (2)
| Country | Link |
|---|---|
| US (1) | US6848078B1 (en) |
| CA (1) | CA2255047A1 (en) |
Cited By (18)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| WO2002005089A1 (en) * | 2000-07-10 | 2002-01-17 | Canon Kabushiki Kaisha | Delivering multimedia descriptions |
| EP1265130A2 (en) * | 2001-06-07 | 2002-12-11 | Sun Microsystems, Inc. | Method and apparatus for runtime merging of hierarchical trees |
| US6671703B2 (en) * | 2000-06-22 | 2003-12-30 | Synchrologic, Inc. | System and method for file transmission using file differentiation |
| WO2004072850A2 (en) * | 2003-02-14 | 2004-08-26 | Rohde & Schwarz Gmbh & Co. Kg | Method and device for modifying modular messages |
| WO2004086224A1 (en) * | 2003-03-27 | 2004-10-07 | Rohde & Schwarz Gmbh & Co. Kg | Method for determining deviations of an end-system message from a reference message |
| AU2001268839B2 (en) * | 2000-07-10 | 2005-08-11 | Canon Kabushiki Kaisha | Delivering multimedia descriptions |
| EP1611524A1 (en) * | 2003-03-19 | 2006-01-04 | Unisys Corporation | Server consolidation analysis |
| WO2006102512A2 (en) * | 2005-03-24 | 2006-09-28 | Computer Associates Think, Inc. | Change control management of xml documents |
| EP1804177A1 (en) * | 2005-12-30 | 2007-07-04 | Sap Ag | Merge tool for structured object models |
| US7512623B2 (en) | 2001-07-06 | 2009-03-31 | Angoss Software Corporation | Method and system for the visual presentation of data mining models |
| US7702661B2 (en) | 2005-03-02 | 2010-04-20 | Computer Associates Think, Inc. | Managing checked out files in a source control repository |
| EP2192497A1 (en) * | 2008-12-01 | 2010-06-02 | Sap Ag | Apparatus and method for comparing computer documents using tree structures |
| US7860924B2 (en) | 2004-05-21 | 2010-12-28 | Computer Associates Think, Inc. | Method and system for supporting multiple versions of web services standards |
| EP2081117A3 (en) * | 2007-10-05 | 2012-10-31 | Canon Kabushiki Kaisha | Information processing apparatus and control method thereof, and document verification apparatus and control method thereof |
| EP2533148A1 (en) * | 2011-06-08 | 2012-12-12 | Siemens Aktiengesellschaft | Graphical editor for developing programs for process control based on templates and detecting the differences between hierarchical data structures |
| CN103761276A (en) * | 2014-01-09 | 2014-04-30 | 大唐移动通信设备有限公司 | Tree-structure data comparison displaying method and device |
| US8799448B2 (en) | 2006-12-20 | 2014-08-05 | Microsoft Corporation | Generating rule packs for monitoring computer systems |
| EP2115625A4 (en) * | 2007-01-22 | 2015-08-26 | Cfph Llc | Document changes |
Families Citing this family (132)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| US6748584B1 (en) * | 1999-12-29 | 2004-06-08 | Veritas Operating Corporation | Method for determining the degree to which changed code has been exercised |
| US6918124B1 (en) * | 2000-03-03 | 2005-07-12 | Microsoft Corporation | Query trees including or nodes for event filtering |
| US7155667B1 (en) * | 2000-06-21 | 2006-12-26 | Microsoft Corporation | User interface for integrated spreadsheets and word processing tables |
| US6883168B1 (en) | 2000-06-21 | 2005-04-19 | Microsoft Corporation | Methods, systems, architectures and data structures for delivering software via a network |
| US7191394B1 (en) | 2000-06-21 | 2007-03-13 | Microsoft Corporation | Authoring arbitrary XML documents using DHTML and XSLT |
| US7624356B1 (en) * | 2000-06-21 | 2009-11-24 | Microsoft Corporation | Task-sensitive methods and systems for displaying command sets |
| US7117435B1 (en) | 2000-06-21 | 2006-10-03 | Microsoft Corporation | Spreadsheet fields in text |
| US6948135B1 (en) * | 2000-06-21 | 2005-09-20 | Microsoft Corporation | Method and systems of providing information to computer users |
| AU2001264895A1 (en) * | 2000-06-21 | 2002-01-02 | Microsoft Corporation | System and method for integrating spreadsheets and word processing tables |
| US7346848B1 (en) * | 2000-06-21 | 2008-03-18 | Microsoft Corporation | Single window navigation methods and systems |
| US7000230B1 (en) * | 2000-06-21 | 2006-02-14 | Microsoft Corporation | Network-based software extensions |
| GB0018042D0 (en) * | 2000-07-21 | 2000-09-13 | Monsell Edm Ltd | Method of and software for recordal and validation of changes to markup language files |
| CA2328566A1 (en) * | 2000-12-15 | 2002-06-15 | Ibm Canada Limited - Ibm Canada Limitee | System and method for providing language-specific extensions to the compare facility in an edit system |
| FR2818409B1 (en) * | 2000-12-18 | 2003-03-14 | Expaway | METHOD FOR DIVIDING STRUCTURED DOCUMENTS INTO MULTIPLE PARTS |
| US7215360B2 (en) * | 2001-04-06 | 2007-05-08 | Triveni Digital, Inc. | Error propagation tree technology |
| US7272594B1 (en) | 2001-05-31 | 2007-09-18 | Autonomy Corporation Ltd. | Method and apparatus to link to a related document |
| US7437662B1 (en) * | 2001-06-15 | 2008-10-14 | Oracle International Corporation | Representing deltas between XML versions using XSLT |
| US6912549B2 (en) * | 2001-09-05 | 2005-06-28 | Siemens Medical Solutions Health Services Corporation | System for processing and consolidating records |
| US7085996B2 (en) * | 2001-10-18 | 2006-08-01 | International Business Corporation | Apparatus and method for source compression and comparison |
| EP1988449B1 (en) * | 2001-10-19 | 2012-02-22 | Sap Ag | Method and computer system for display state adjustment of tree-nodes |
| JP2003150586A (en) * | 2001-11-12 | 2003-05-23 | Ntt Docomo Inc | Document converting system, document converting method and computer-readable recording medium with document converting program recorded thereon |
| US20030145278A1 (en) * | 2002-01-22 | 2003-07-31 | Nielsen Andrew S. | Method and system for comparing structured documents |
| JP4186474B2 (en) * | 2002-02-20 | 2008-11-26 | 富士通株式会社 | Profile combining apparatus, method and program |
| US7260773B2 (en) * | 2002-03-28 | 2007-08-21 | Uri Zernik | Device system and method for determining document similarities and differences |
| US7437664B2 (en) * | 2002-06-18 | 2008-10-14 | Microsoft Corporation | Comparing hierarchically-structured documents |
| US20070179961A1 (en) * | 2002-07-15 | 2007-08-02 | Fabio Gava | Hierarchical storage |
| US20040205581A1 (en) * | 2002-07-15 | 2004-10-14 | Gava Fabio M. | Hierarchical storage |
| JP2004318188A (en) * | 2002-09-26 | 2004-11-11 | Victor Co Of Japan Ltd | Program for receiving structured data |
| US7680833B1 (en) * | 2002-11-22 | 2010-03-16 | Bmc Software, Inc. | System and method for database structure comparison |
| US7171462B1 (en) * | 2002-12-18 | 2007-01-30 | Cisco Technology, Inc. | Context-sensitive intelligent diffs of router configurations |
| US7415672B1 (en) | 2003-03-24 | 2008-08-19 | Microsoft Corporation | System and method for designing electronic forms |
| US7370066B1 (en) * | 2003-03-24 | 2008-05-06 | Microsoft Corporation | System and method for offline editing of data files |
| US7275216B2 (en) * | 2003-03-24 | 2007-09-25 | Microsoft Corporation | System and method for designing electronic forms and hierarchical schemas |
| US7296017B2 (en) | 2003-03-28 | 2007-11-13 | Microsoft Corporation | Validation of XML data files |
| US7913159B2 (en) | 2003-03-28 | 2011-03-22 | Microsoft Corporation | System and method for real-time validation of structured data files |
| US7516145B2 (en) * | 2003-03-31 | 2009-04-07 | Microsoft Corporation | System and method for incrementally transforming and rendering hierarchical data files |
| US7530015B2 (en) * | 2003-06-25 | 2009-05-05 | Microsoft Corporation | XSD inference |
| US7451392B1 (en) * | 2003-06-30 | 2008-11-11 | Microsoft Corporation | Rendering an HTML electronic form by applying XSLT to XML using a solution |
| US7406660B1 (en) | 2003-08-01 | 2008-07-29 | Microsoft Corporation | Mapping between structured data and a visual surface |
| US7334187B1 (en) | 2003-08-06 | 2008-02-19 | Microsoft Corporation | Electronic form aggregation |
| US7877399B2 (en) * | 2003-08-15 | 2011-01-25 | International Business Machines Corporation | Method, system, and computer program product for comparing two computer files |
| US20050091340A1 (en) * | 2003-10-01 | 2005-04-28 | International Business Machines Corporation | Processing interactive content offline |
| US7185277B1 (en) * | 2003-10-24 | 2007-02-27 | Microsoft Corporation | Method and apparatus for merging electronic documents containing markup language |
| US8819072B1 (en) | 2004-02-02 | 2014-08-26 | Microsoft Corporation | Promoting data from structured data files |
| GB2411014A (en) * | 2004-02-11 | 2005-08-17 | Autonomy Corp Ltd | Automatic searching for relevant information |
| JP2005301996A (en) * | 2004-03-16 | 2005-10-27 | Canon Inc | Document integration apparatus, and method, program, and recording medium of same apparatus |
| US7496837B1 (en) * | 2004-04-29 | 2009-02-24 | Microsoft Corporation | Structural editing with schema awareness |
| US7281018B1 (en) | 2004-05-26 | 2007-10-09 | Microsoft Corporation | Form template data source change |
| US7774620B1 (en) | 2004-05-27 | 2010-08-10 | Microsoft Corporation | Executing applications at appropriate trust levels |
| US7392471B1 (en) * | 2004-07-28 | 2008-06-24 | Jp Morgan Chase Bank | System and method for comparing extensible markup language (XML) documents |
| US7692636B2 (en) * | 2004-09-30 | 2010-04-06 | Microsoft Corporation | Systems and methods for handwriting to a screen |
| US7392243B2 (en) * | 2004-10-20 | 2008-06-24 | Microsoft Corporation | Using permanent identifiers in documents for change management |
| US8487879B2 (en) * | 2004-10-29 | 2013-07-16 | Microsoft Corporation | Systems and methods for interacting with a computer through handwriting to a screen |
| US7712022B2 (en) * | 2004-11-15 | 2010-05-04 | Microsoft Corporation | Mutually exclusive options in electronic forms |
| US20060107224A1 (en) * | 2004-11-15 | 2006-05-18 | Microsoft Corporation | Building a dynamic action for an electronic form |
| US7721190B2 (en) | 2004-11-16 | 2010-05-18 | Microsoft Corporation | Methods and systems for server side form processing |
| US20060117075A1 (en) * | 2004-12-01 | 2006-06-01 | International Business Machines Corporation | Prerequisite, dependent and atomic deltas |
| US20060120518A1 (en) * | 2004-12-03 | 2006-06-08 | Motorola, Inc. | Method and system for information relay between multiple user environments |
| US20060123081A1 (en) * | 2004-12-03 | 2006-06-08 | Motorola, Inc. | Method and system for seamless portability by profile sharing |
| US7904801B2 (en) | 2004-12-15 | 2011-03-08 | Microsoft Corporation | Recursive sections in electronic forms |
| US7937651B2 (en) * | 2005-01-14 | 2011-05-03 | Microsoft Corporation | Structural editing operations for network forms |
| US7725834B2 (en) * | 2005-03-04 | 2010-05-25 | Microsoft Corporation | Designer-created aspect for an electronic form template |
| US7673228B2 (en) * | 2005-03-30 | 2010-03-02 | Microsoft Corporation | Data-driven actions for network forms |
| US8010515B2 (en) | 2005-04-15 | 2011-08-30 | Microsoft Corporation | Query to an electronic form |
| US20070006130A1 (en) * | 2005-06-02 | 2007-01-04 | Arnold Stamler | Model oriented method of automatically detecting alterations in the design of a software system |
| US9792351B2 (en) * | 2005-06-10 | 2017-10-17 | International Business Machines Corporation | Tolerant and extensible discovery of relationships in data using structural information and data analysis |
| US20060282470A1 (en) * | 2005-06-10 | 2006-12-14 | Hong-Lee Yu | Determining compliance of a database architecture to an enterprise data standard |
| US20070011665A1 (en) * | 2005-06-21 | 2007-01-11 | Microsoft Corporation | Content syndication platform |
| US8200975B2 (en) | 2005-06-29 | 2012-06-12 | Microsoft Corporation | Digital signatures for network forms |
| US7681234B2 (en) * | 2005-06-30 | 2010-03-16 | Microsoft Corporation | Preventing phishing attacks |
| US20070015553A1 (en) * | 2005-07-12 | 2007-01-18 | Microsoft Corporation | Compact and durable clamshell smartphone |
| US7676242B2 (en) * | 2005-07-12 | 2010-03-09 | Microsoft Corporation | Compact and durable thin smartphone |
| US20070015533A1 (en) * | 2005-07-12 | 2007-01-18 | Microsoft Corporation | Mono hinge for communication device |
| US7630741B2 (en) * | 2005-07-12 | 2009-12-08 | Microsoft Corporation | Compact and durable messenger device |
| CN100433640C (en) * | 2005-09-09 | 2008-11-12 | 中兴通讯股份有限公司 | Upper/lower layer grid management data comparative method for telecommunication managerial grid |
| US20070061706A1 (en) * | 2005-09-14 | 2007-03-15 | Microsoft Corporation | Mapping property hierarchies to schemas |
| US20070061467A1 (en) * | 2005-09-15 | 2007-03-15 | Microsoft Corporation | Sessions and session states |
| US8001459B2 (en) | 2005-12-05 | 2011-08-16 | Microsoft Corporation | Enabling electronic documents for limited-capability computing devices |
| US7605815B1 (en) | 2006-01-03 | 2009-10-20 | Emc Corporation | Selection representation methods applied to logical groupings |
| US7526495B2 (en) * | 2006-01-03 | 2009-04-28 | Emc Corporation | Real-time construction of a selection representation for items in tree structures |
| US7574445B2 (en) | 2006-01-03 | 2009-08-11 | Emc Corporation | Generating a selection representation for items in tree structures |
| US7620646B1 (en) | 2006-01-03 | 2009-11-17 | Emc Corporation | Real-time construction of a selection representation for items in tree structures |
| US7779343B2 (en) | 2006-01-30 | 2010-08-17 | Microsoft Corporation | Opening network-enabled electronic documents |
| US8640231B2 (en) * | 2006-02-23 | 2014-01-28 | Microsoft Corporation | Client side attack resistant phishing detection |
| US7861229B2 (en) * | 2006-03-16 | 2010-12-28 | Microsoft Corporation | Complexity metrics for data schemas |
| US7992091B2 (en) * | 2006-03-30 | 2011-08-02 | At&T Intellectual Property I, L.P. | Message-oriented divergence and convergence of message documents |
| US8429526B2 (en) * | 2006-04-10 | 2013-04-23 | Oracle International Corporation | Efficient evaluation for diff of XML documents |
| US7913161B2 (en) * | 2006-05-08 | 2011-03-22 | Enwisen, Inc. | Computer-implemented methods and systems for electronic document inheritance |
| US20070294612A1 (en) * | 2006-06-20 | 2007-12-20 | Microsoft Corporation | Comparing and Managing Multiple Presentations |
| US7606889B1 (en) * | 2006-06-30 | 2009-10-20 | Emc Corporation | Methods and systems for comparing storage area network configurations |
| US8056063B2 (en) * | 2006-08-07 | 2011-11-08 | International Business Machines Corporation | Method and apparatus minimizing code duplication in a statically typeable language program |
| US9207933B2 (en) * | 2006-10-10 | 2015-12-08 | International Business Machines Corporation | Identifying authors of changes between multiple versions of a file |
| US7984375B1 (en) * | 2006-10-10 | 2011-07-19 | Adobe Systems Incorporated | Automated detection and implementation of state and object modifications |
| US8635242B2 (en) * | 2006-10-11 | 2014-01-21 | International Business Machines Corporation | Processing queries on hierarchical markup data using shared hierarchical markup trees |
| US8108765B2 (en) * | 2006-10-11 | 2012-01-31 | International Business Machines Corporation | Identifying and annotating shared hierarchical markup document trees |
| US7694282B2 (en) * | 2006-12-12 | 2010-04-06 | Arkhipov Mikhail E | Mapping breakpoints between web based documents |
| US8209605B2 (en) * | 2006-12-13 | 2012-06-26 | Pado Metaware Ab | Method and system for facilitating the examination of documents |
| US7844608B2 (en) * | 2006-12-15 | 2010-11-30 | Yahoo! Inc. | Clustered query support for a database query engine |
| US7802179B2 (en) * | 2006-12-21 | 2010-09-21 | Microsoft Corporation | Synchronizing data between different editor views |
| US7992106B2 (en) * | 2007-01-08 | 2011-08-02 | Varia Holdings Llc | Menu trails for a portable media player |
| US20080177782A1 (en) * | 2007-01-10 | 2008-07-24 | Pado Metaware Ab | Method and system for facilitating the production of documents |
| US7707191B2 (en) * | 2007-01-18 | 2010-04-27 | Microsoft Corporation | Synchronizing undo/redo operations between different document views |
| GB0712935D0 (en) * | 2007-07-04 | 2007-08-15 | Deltamxl Ltd | Representation of multiple markup language files in one file for the productionof new new markup language files |
| CN101123535B (en) * | 2007-09-14 | 2012-07-11 | 中兴通讯股份有限公司 | ANS.1 packet comparison method and system |
| US20090199090A1 (en) * | 2007-11-23 | 2009-08-06 | Timothy Poston | Method and system for digital file flow management |
| US9129342B2 (en) * | 2007-12-14 | 2015-09-08 | William E. Denk, JR. | Method and system for facilitating electronic communication between the public and a public personality or representative |
| US9384175B2 (en) * | 2008-02-19 | 2016-07-05 | Adobe Systems Incorporated | Determination of differences between electronic documents |
| US8291403B2 (en) * | 2008-06-30 | 2012-10-16 | Symantec Operating Corporation | Install-unit upgrade using dynamic configuration data manipulation and merging |
| US8145992B2 (en) * | 2008-06-30 | 2012-03-27 | Xerox Corporation | Validation assisted document conversion design |
| US20100010801A1 (en) * | 2008-07-11 | 2010-01-14 | Microsoft Corporation | Conflict resolution and error recovery strategies |
| US8301994B1 (en) * | 2008-09-12 | 2012-10-30 | Adobe Systems Incorporated | Synchronizing multiple hierarchal data structures |
| US8265606B2 (en) * | 2008-10-09 | 2012-09-11 | Microsoft Corporation | Targeted advertisements to social contacts |
| WO2010106681A1 (en) * | 2009-03-19 | 2010-09-23 | 富士通株式会社 | Computer-readable storage medium for recording database search program, database search device, and database search method |
| US9330191B2 (en) | 2009-06-15 | 2016-05-03 | Microsoft Technology Licensing, Llc | Identifying changes for online documents |
| US8667015B2 (en) * | 2009-11-25 | 2014-03-04 | Hewlett-Packard Development Company, L.P. | Data extraction method, computer program product and system |
| US8694557B2 (en) * | 2010-07-02 | 2014-04-08 | Sap Ag | Extensibility of metaobjects |
| US9626368B2 (en) * | 2012-01-27 | 2017-04-18 | International Business Machines Corporation | Document merge based on knowledge of document schema |
| US9519631B2 (en) | 2012-03-30 | 2016-12-13 | Microsoft Technology Licensing, Llc | Semantic diff and automerge |
| US9037994B2 (en) * | 2012-06-26 | 2015-05-19 | International Business Machines Corporation | Navigation to a data definition in a diff context |
| US9229923B2 (en) | 2012-06-27 | 2016-01-05 | Technologies Xpertdoc Inc. | Method and system for producing documents |
| US9323767B2 (en) | 2012-10-01 | 2016-04-26 | Longsand Limited | Performance and scalability in an intelligent data operating layer system |
| US9471641B1 (en) * | 2013-03-14 | 2016-10-18 | The Mathworks, Inc | Generating block recommendations based on existing model information |
| US10423495B1 (en) * | 2014-09-08 | 2019-09-24 | Veritas Technologies Llc | Deduplication grouping |
| EP3107001A1 (en) * | 2015-06-15 | 2016-12-21 | Thomson Licensing | Method and apparatus for document consistency analysis |
| WO2019078876A1 (en) * | 2017-10-20 | 2019-04-25 | Google Llc | Reconciling conflicts between replicas of tree-structured data |
| US10783138B2 (en) * | 2017-10-23 | 2020-09-22 | Google Llc | Verifying structured data |
| US11314807B2 (en) | 2018-05-18 | 2022-04-26 | Xcential Corporation | Methods and systems for comparison of structured documents |
| CN109213976A (en) * | 2018-09-13 | 2019-01-15 | 国网江苏省电力有限公司检修分公司 | The female poor reorganization and expansion configuration file otherness comparative approach of intelligent substation, system and equipment |
| US11288448B2 (en) * | 2019-07-26 | 2022-03-29 | Arista Networks, Inc. | Techniques for implementing a command line interface |
| US11194833B2 (en) * | 2019-10-28 | 2021-12-07 | Charbel Gerges El Gemayel | Interchange data format system and method |
| CN111144090A (en) * | 2019-12-23 | 2020-05-12 | 网易（杭州）网络有限公司 | File comparison method and device, electronic equipment and storage medium |
| CN114462271A (en) * | 2022-01-20 | 2022-05-10 | 上海峰飞航空科技有限公司 | Finite element model element layering information modification method, system, equipment and medium |
Family Cites Families (11)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| US3711863A (en) * | 1972-01-21 | 1973-01-16 | Honeywell Inf Systems | Source code comparator computer program |
| JPH04181423A (en) * | 1990-11-16 | 1992-06-29 | Fujitsu Ltd | Version control system |
| CA2048039A1 (en) * | 1991-07-19 | 1993-01-20 | Steven Derose | Data processing system and method for generating a representation for and random access rendering of electronic documents |
| JP3724847B2 (en) * | 1995-06-05 | 2005-12-07 | 株式会社日立製作所 | Structured document difference extraction method and apparatus |
| US5862325A (en) * | 1996-02-29 | 1999-01-19 | Intermind Corporation | Computer-based communication system and method using metadata defining a control structure |
| US5806074A (en) * | 1996-03-19 | 1998-09-08 | Oracle Corporation | Configurable conflict resolution in a computer implemented distributed database |
| EP1019807B1 (en) * | 1997-02-27 | 2017-04-05 | Siebel Systems, Inc. | Method of migrating to a successive level of a software distribution incorporating local modifications |
| US6226652B1 (en) * | 1997-09-05 | 2001-05-01 | International Business Machines Corp. | Method and system for automatically detecting collision and selecting updated versions of a set of files |
| US6216140B1 (en) * | 1997-09-17 | 2001-04-10 | Hewlett-Packard Company | Methodology for the efficient management of hierarchically organized information |
| US6466240B1 (en) * | 1998-07-08 | 2002-10-15 | Vadim Maslov | Method for visually writing programs or scripts that transform structured text presented as a tree |
| US6560620B1 (en) * | 1999-08-03 | 2003-05-06 | Aplix Research, Inc. | Hierarchical document comparison system and method |
-
1998
- 1998-11-30 CA CA002255047A patent/CA2255047A1/en not_active Abandoned
-
1999
- 1999-11-10 US US09/437,619 patent/US6848078B1/en not_active Expired - Fee Related
Cited By (29)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| US6671703B2 (en) * | 2000-06-22 | 2003-12-30 | Synchrologic, Inc. | System and method for file transmission using file differentiation |
| AU2001268839B2 (en) * | 2000-07-10 | 2005-08-11 | Canon Kabushiki Kaisha | Delivering multimedia descriptions |
| WO2002005089A1 (en) * | 2000-07-10 | 2002-01-17 | Canon Kabushiki Kaisha | Delivering multimedia descriptions |
| EP1265130A3 (en) * | 2001-06-07 | 2006-10-18 | Sun Microsystems, Inc. | Method and apparatus for runtime merging of hierarchical trees |
| EP1265130A2 (en) * | 2001-06-07 | 2002-12-11 | Sun Microsystems, Inc. | Method and apparatus for runtime merging of hierarchical trees |
| US7512623B2 (en) | 2001-07-06 | 2009-03-31 | Angoss Software Corporation | Method and system for the visual presentation of data mining models |
| WO2004072850A2 (en) * | 2003-02-14 | 2004-08-26 | Rohde & Schwarz Gmbh & Co. Kg | Method and device for modifying modular messages |
| WO2004072850A3 (en) * | 2003-02-14 | 2004-09-23 | Rohde & Schwarz | Method and device for modifying modular messages |
| US7587519B2 (en) | 2003-02-14 | 2009-09-08 | Rohde & Schwarz Gmbh & Co. Kg | Method and device for modifying modular messages |
| EP1611524A1 (en) * | 2003-03-19 | 2006-01-04 | Unisys Corporation | Server consolidation analysis |
| EP1611524A4 (en) * | 2003-03-19 | 2008-10-29 | Unisys Corp | Server consolidation analysis |
| JP2010206806A (en) * | 2003-03-27 | 2010-09-16 | Rohde & Schwarz Gmbh & Co Kg | Method for determining mutation generated from reference message of end system message |
| WO2004086224A1 (en) * | 2003-03-27 | 2004-10-07 | Rohde & Schwarz Gmbh & Co. Kg | Method for determining deviations of an end-system message from a reference message |
| US7890567B2 (en) | 2003-03-27 | 2011-02-15 | Rohde & Schwarz Gmbh & Co. Kg | Method for determining deviations of an end-system message from a reference message |
| CN1764900B (en) * | 2003-03-27 | 2010-04-28 | 罗德施瓦兹两合股份有限公司 | Method for determining deviations of an end-system message from a reference message |
| KR101108594B1 (en) * | 2003-03-27 | 2012-02-06 | 로오데운트쉬바르츠게엠베하운트콤파니카게 | Method For Determining Deviations Of An End-System Message From A Reference Message |
| US7860924B2 (en) | 2004-05-21 | 2010-12-28 | Computer Associates Think, Inc. | Method and system for supporting multiple versions of web services standards |
| US7702661B2 (en) | 2005-03-02 | 2010-04-20 | Computer Associates Think, Inc. | Managing checked out files in a source control repository |
| WO2006102512A2 (en) * | 2005-03-24 | 2006-09-28 | Computer Associates Think, Inc. | Change control management of xml documents |
| WO2006102512A3 (en) * | 2005-03-24 | 2007-03-15 | Computer Ass Think Inc | Change control management of xml documents |
| EP1804177A1 (en) * | 2005-12-30 | 2007-07-04 | Sap Ag | Merge tool for structured object models |
| US8799448B2 (en) | 2006-12-20 | 2014-08-05 | Microsoft Corporation | Generating rule packs for monitoring computer systems |
| EP2115625A4 (en) * | 2007-01-22 | 2015-08-26 | Cfph Llc | Document changes |
| EP2081117A3 (en) * | 2007-10-05 | 2012-10-31 | Canon Kabushiki Kaisha | Information processing apparatus and control method thereof, and document verification apparatus and control method thereof |
| EP2192497A1 (en) * | 2008-12-01 | 2010-06-02 | Sap Ag | Apparatus and method for comparing computer documents using tree structures |
| US7996435B2 (en) | 2008-12-01 | 2011-08-09 | Sap Ag | Apparatus and method for comparing computer documents using tree structures |
| EP2533148A1 (en) * | 2011-06-08 | 2012-12-12 | Siemens Aktiengesellschaft | Graphical editor for developing programs for process control based on templates and detecting the differences between hierarchical data structures |
| CN103761276B (en) * | 2014-01-09 | 2017-10-31 | 大唐移动通信设备有限公司 | Methods of exhibiting and device that a kind of tree structure data compares |
| CN103761276A (en) * | 2014-01-09 | 2014-04-30 | 大唐移动通信设备有限公司 | Tree-structure data comparison displaying method and device |
Also Published As
| Publication number | Publication date |
|---|---|
| US6848078B1 (en) | 2005-01-25 |
Similar Documents
| Publication | Publication Date | Title |
|---|---|---|
| US6848078B1 (en) | Comparison of hierarchical structures and merging of differences | |
| US8020118B2 (en) | Presentation of items arranged in a hierarchy | |
| US6792475B1 (en) | System and method for facilitating the design of a website | |
| US7614016B2 (en) | Multiple roots in navigation pane | |
| US6886133B2 (en) | Interactive formatting interface | |
| US8078960B2 (en) | Rendering an HTML electronic form by applying XSLT to XML using a solution | |
| US8078962B2 (en) | Apparatus and method for generating web site navigations | |
| US20140310320A1 (en) | Creating mapping rules from meta data for data transformation utilizing visual editing | |
| EP1594079A2 (en) | Generation of meaningful names in flattened hierarchical structures | |
| US20070179996A1 (en) | Structured data storage device and structured data storage method | |
| US20150127688A1 (en) | Facilitating discovery and re-use of information constructs | |
| JP2004240954A (en) | Method for presenting hierarchical data | |
| JP2005515557A (en) | Dynamic legal database providing historical and current versions of the code | |
| JP2004030582A (en) | Structured document compiling apparatus, structured document compiling method and program | |
| US8370399B2 (en) | Building, viewing, and manipulating schema sets | |
| EP1665089A1 (en) | Method of providing tree-structured views of data | |
| US20050273721A1 (en) | Data transformation system | |
| US7337187B2 (en) | XML document classifying method for storage system | |
| US7941456B2 (en) | Information management method, information management program and information management apparatus | |
| US20090144299A1 (en) | Data storage method | |
| JP2004178015A (en) | Hierarchical structure display device and hierarchical structure display method | |
| JP3914081B2 (en) | Access authority setting method and structured document management system | |
| US6874121B1 (en) | Document editor for editing structure documents | |
| US20090228678A1 (en) | Mapping definition creation system and mapping definition creation program | |
| US7359914B2 (en) | Reference manager |
Legal Events
| Date | Code | Title | Description |
|---|---|---|---|
| EEER | Examination request | ||
| FZDE | Discontinued | ||
| FZDE | Discontinued |
Effective date: 20061130 |