SYSTEM FOR COMPARISON AND MERGING OF VERSIONS IN EDITED WEBSITES AND INTERACTIVE APPLICATIONS

• US 20150154164A1
• Filed: 02/11/2015
• Published: 06/04/2015
• Est. Priority Date: 09/12/2013
• Status: Active Grant

• Current Assignee: Wix.com Ltd.
• Original Assignee: Wix.com Ltd.
• Inventors: GOLDSTEIN, Yuval, KAUFMAN, Amit, HOLLANDER, Oren, BEN-AHARON, Roni
• Granted Patent: US 9,817,804 B2
• Time in Patent Office: Days
• US Class Current: 1/1
• CPC Class Codes: G06F 16/9577 Optimising the visualization of content, e.g. distillation of HTML documents
• CPC Class Codes: G06F 40/103 Formatting, i.e. changing of presentation of documents automatic justification G06F40/189; automatic line break hyphenation G06F40/191
• CPC Class Codes: G06F 40/106 Display of layout of documents; Previewing
• CPC Class Codes: G06F 40/143 Markup, e.g. Standard Generalized Markup Language [SGML] or Document Type Definition [DTD]
• CPC Class Codes: G06F 40/194 Calculation of difference between files
• CPC Class Codes: G06F 40/197 Version control for software G06F8/71

Abstract

A device implementable in a website design program includes a component based version comparer to compare at least two versions of a website, the at least two versions having components in a set of hierarchies and to generate a difference tree representing the differences in the components between the at least two versions of the same website, where the version comparer preprocesses the components in each single version of the at least two versions of the website to determine at least one of internal geometric, semantic, content and attribute relationships before comparing the components and the relationships between the at least two versions of the website using at least one of semantic, geometrical, content and attribute analysis. The device also includes a version merger to create an integrated version of the two versions of the website based on the difference tree.

Claims

1. A device implementable in a website design program, said device comprising:

a component based version comparer to compare at least two versions of a website, said at least two versions having components in a set of hierarchies, wherein said components are at least one of a visual component, a container and a non-visual site element, and to generate a difference tree representing the differences in said components between said at least two versions of the same website, wherein said version comparer preprocesses said components in each single version of said at least two versions of said website to determine at least one of internal geometric, semantic, content and attribute relationships before comparing said components and said relationships between said at least two versions of said website using at least one of semantic, geometrical, content and attribute analysis; and

a version merger to create an integrated version of said two versions of said website based on said difference tree.

2. The device of claim 1 and also comprising a version resolver to resolve conflicts in said generation of said difference tree.

3. The device of claim 1 and wherein said device is implementable on at least one of a server and a client.

4. The device of claim 1 and wherein said at least two versions of the same website comprise at least one version from an external version control system.

5. The device of claim 1 and wherein said website components are stored in at least one of a database, an object store, markup language files and data interchange format files.

6. The device of claim 1 and wherein said hierarchies and said difference tree are trees and wherein said trees comprise nodes representing said components, said components having attributes.

7. The device of claim 6 and wherein said version comparer comprises:

a structural version comparer to compare said nodes through comparison of their geometrical, content and semantic relationships;

an order based version comparer to compare said nodes based on the order of said nodes and to pre-match said nodes according to an internal said website design system identifier;

a semantic matching comparer to perform semantic classification on said nodes and match them according to their semantic classes and geometrical parameters;

a comparison selector and coordinator to provide selection and coordination between said structural version comparer, said order based version comparer and said semantic matching comparer based on at least one of the structure and attributes of said components; and

a difference tree generator to generate said difference tree based on results of at least one of said structural version comparer, said order based version comparer and said semantic matching comparer.

8. The device of claim 6 and wherein said difference tree comprises at least one of a group node and a comparison node.

9. The device of claim 2 and wherein said version resolver comprises:

a difference tree browser to display said difference tree hierarchy for manual version resolving;

a merged page displayer to present a display of at least one current state of a merged page;

a component attribute browser to display the values of a component attribute, including displaying the two values for components for which there is a comparison node;

a resolver selector and coordinator to select and coordinate between said difference tree browser, said merged page displayer and said component attribute browser; and

a merged component tree generator to provide combined results from at least one of said difference tree browser, said merged page displayer and said component attribute browser and to generate a new resolved difference tree.

10. The device of claim 7 and wherein said structural version comparer comprises:

an ID-based matcher to match all said components in said trees that have the same ID;

a geometrical relationship analyzer to perform geometrical matching to find pairs among non-ID-matched said components in said trees.

a component/attribute analyzer to check for changes in said component attributes;

a component semantic analyzer to find pairs among non-ID-matched said components; and

a split merge analyzer to detect splitting and merging of said components and containers and to further detect ID retaining split transformations.

11. The device of claim 7 and wherein said order based version comparer comprises:

a preprocessor to analyze said components in each said tree to extract relevant component sets and to analyze and modify said components for comparison where necessary;

an orderer to determine an order for the elements within each said node; and

a sequence matcher to perform sequence matching on said components.

12. The device of claim 7 and wherein said semantic matching comparer comprises:

a semantic classifier to classify said components into a semantic classification; and

a class/attribute matcher to create a match between elements from two matched components based on said semantic classification.

13. The device of claim 1 wherein said geometrical relationship is at least one of overlap, intersection, proximity, relative position and relative size.

14. The device of claim 9 and wherein said merged page displayer comprises an animator to animate the display of conflicting said components by switching between said at least one states.

15. The device of claim 14 and wherein said animator is at least one of automatic and controlled by user.

16. The device of claim 14 and wherein said animator is integrated with dynamic layout processing.

17. The device of claim 7 and wherein said coordination is based on a combined metric of results returned from said structural version comparer, said order based version comparer and said semantic matching comparer.

18. The device of claim 17 and wherein said metric is a weighted average.

19. The device of claim 9 and wherein said difference tree browser comprises a hierarchical system menu generator to generate a display of conflicting said components.

20. The device of claim 9 and wherein said display of at least one current state of said merged page is based on a weighted average of said states.

21. A method for a website design program, said method comprising:

comparing at least two versions of a website, said at least two versions having components in a set of hierarchies, wherein said components are at least one of a visual component, a container and a non-visual site element;

generating a difference tree representing the differences in said components between said at least two versions of the same website;

preprocessing said components in each single version of said at least two versions of said website to determine at least one of internal geometric, semantic, content and attribute relationships;

comparing said components and said relationships between said at least two versions of said website using at least one of semantic, geometrical, content and attribute analysis; and

creating an integrated version of said two versions of said website based on said difference tree.

22. The method of claim 21 and also comprising resolving conflicts in said generation of said difference tree.

23. The method of claim 21 and wherein said method is implementable on at least one of a server and a client.

24. The method of claim 21 and wherein said at least two versions of the same website comprise at least one version from an external version control system.

25. The method of claim 21 and wherein said website components are stored in at least one of a database, an object store, markup language files and data interchange format files.

26. The method of claim 21 and wherein said hierarchies and said difference tree are trees and wherein said trees comprise nodes representing said components, said components having attributes.

27. The method of claim 26 and wherein said comparing at least two versions of a website, generating, preprocessing, comparing said components and said relationships and creating comprises:

comparing said nodes through comparison of their geometrical, content and semantic relationships;

comparing said nodes based on the order of said nodes and pre-matching said nodes according to an internal said website design system identifier;

performing semantic classification on said nodes and matching them according to their semantic classes and geometrical parameters;

providing selection and coordinating between said comparing said nodes through comparison of their geometrical, content and semantic relationships, said comparing said nodes based on the order of said nodes and pre-matching and said performing semantic classification based on at least one of the structure and attributes of said components; and

generating said difference tree based on results of at least one of said comparing said nodes through comparison of their geometrical, content and semantic relationships, said comparing said nodes based on the order of said nodes and pre-matching and said performing semantic classification.

28. The method of claim 26 and wherein said difference tree comprises at least one of a group node and a comparison node.

29. The method of claim 22 and wherein said resolving comprises:

displaying said difference tree hierarchy for manual version resolving;

presenting a display of at least one current state of a merged page;

displaying the values of a component attribute, including displaying the two values for components for which there is a comparison node;

selecting and coordinating between said displaying said difference tree hierarchy, said presenting and said displaying the values of a component attribute;

providing the combined results from said displaying said difference tree browser, said presenting and said displaying the values of a component attribute; and

generating a new resolved difference tree.

30. The method of claim 27 and wherein said comparing said nodes based on the order of said nodes and pre-matching comprises:

matching all said components in said trees that have the same ID;

performing geometrical matching to find pairs among non-ID-matched said components in said trees;

checking for changes in said component attributes;

finding pairs among non-ID-matched said components; and

detecting splitting and merging of said components and containers and further detecting ID retaining split transformations.

31. The method of claim 27 and wherein said comparing said nodes through comparison of their geometrical, content and semantic relationships comprises:

preprocessing said components in each said tree to extract relevant component sets and analyzing and modifying said components for comparison where necessary;

determining an order for the elements within each said node; and

performing sequence matching on said components.

32. The method of claim 27 and wherein said performing semantic classification comprises:

classifying said components into a semantic classification; and

creating a match between elements from two matched components based on said semantic classification.

33. The method of claim 21 wherein said geometrical relationship is at least one of overlap, intersection, proximity, relative position and relative size.

34. The method of claim 29 and wherein said presenting a display of at least one current state of a merged page comprises animating the display of conflicting said components by switching between said at least one states.

35. The method of claim 24 and wherein said animating is at least one of automatic and controlled by user.

36. The method of claim 24 and wherein said animating is integrated with dynamic layout processing.

37. The method of claim 27 and wherein said coordinating is based on a combined metric of results returned from said structural version comparer, said order based version comparer and said semantic matching comparer.

38. The method of claim 37 and wherein said metric is a weighted average.

39. The method of claim 29 and wherein said displaying said difference tree hierarchy for manual version resolving comprises generating a display of conflicting said components.

40. The method of claim 29 and wherein said displaying of at least one current state of said merged page is based on a weighted average of said states.