This chapter provides an over view and discusses how to:
Compare and Merge text definitions.
Set merge properties.
Run a Project PeopleCode diff/merge.
PeopleSoft Application Designer enables you to compare the same text definition shared between two databases (or one database and a file) as well as the same text file used by different PeopleSoft releases. Similar to the Visual Compare interface for pages, you can view the text definitions or files side-by-side while the system detects each difference and clearly indicates the differences using visual queues. During this comparison, you choose which lines from each file or definition to carry forward into the merged version.
Note. The merge process and interface is identical for all text definitions and text files.
Text definitions are Application Designer definitions that are comprised of text, or code. They are:
PeopleCode
SQL
HTML
XSLT
Text files refer to text files used to store program logic or configuration settings within the PeopleSoft system. They are:
COBOL files (.CBL).
Configuration files (.CFG).
Data Mover script files (.DMS).
Initialization files (.INI).
SQR source files (.SQC).
SQL files (.SQL).
SQR report files (.SQR).
This section discusses how to:
Run the merge process for text definitions.
Run the merge process for external text files.
Use the merge interface.
To run the merge process for text definitions:
Launch the Upgrade Definition Type window for a text definition.
Select the definition you want to compare and merge.
Right-click, and select Merge Definition.
Select one of the following:
Database. Select this option if the definition to which you are comparing exists in another database. The system prompts you to sign on to the other database.
File. Select this option if the definition to which you are comparing exists in a project file. The system prompts you to navigate to the project file.
After selecting what you want to be the result of the final merge, click Save.
To run the merge process for a single pair of external text files:
Select Tools, Diff / Merge External Text, Files.
In the To Merge File 'A': dialog box, navigate to, and select the file you want to merge, and click Open.
Typically, the 'A' file is the file that is either older or contains less lines to merge into the most current file.
In the To Merge File 'B': dialog box, navigate to, and select the file you want to merge, and click Open.
Typically, the 'B' file is the file that is most recent and contains more of the lines you want to remain in the resulting merged file.
To run the merge process for multiple pairs of external files:
Select Tools, Diff / Merge External Text, Folders.
In the Merge Folder dialog box navigate to and select the appropriate directory for Folder A: and Folder B:.
How you have the options set on the Merge Properties dialog box, determines to which directory the system saves the merged results.
Select Include sub-folders if you intend to compare multiple sub-folders within one directory, otherwise, the system only compares and merges files in the immediate directory specified.
Click OK.
The merge interface displays three windows: the A: window, the B: window, and the Output window.
Working with the A: and B: Windows
Text Type |
Description |
Text definition |
The A: window displays the definition existing in the database to which you are currently signed on. Code that appears only in this definition appear in the color specified in the Merge Properties for A:. The label of the A: window adheres to the following syntax: A: Database '<Database Name>' The B: window displays the definition existing in the database or file to which you are comparing the definition existing in database A:. Code that appears only in this definition appear in the color specified in the Merge Properties for B:. The label of the B: window adheres to the following syntax: B: <Database/File> '<Database/File Name>' |
External text file |
The A: window displays the text file specified in the To Merge File 'A' dialog. Code that appears only in this file appears in the color specified in the Merge Properties for A:. The label of the A: window adheres to the following syntax: A: <file path> The B: window displays the text file specified in the To Merge File 'A' dialog. Code that appears only in this text file appears in the color specified in the Merge Properties for B:. The label of the B: window adheres to the following syntax: B: <file path> Note. If you are comparing and merging multiple files in a directory structure (using the Folders option), you view individual pairs of files by selecting them in the Folder Merge Diff List window. |
Note. In the context of the merge feature, there is not necessarily a concept of "source" and "target." Assigning an "A" and "B" value is used only to distinguish the different locations of definitions and external text files.
Working with the Output Window
The output window displays what will be the finished result of the merge after clicking Save.
Initially either the A: or B: definition view will appear, depending on what you selected as the Initial Output View in the Merge Properties dialog. The Initial View window label displays the value you selected.
The output window label also displays the Save To value, which represents the location in which the merged results will be saved.
You can perform simple editing of a line in a text definition appearing in the output window, but you cannot add new lines.
Note. The Merge tab of the PeopleSoft Application Designer output window, displays any PeopleCode compile syntax errors. The merged result cannot be saved if there are syntax errors.
Note. While there is an output window for the merge feature, the output window for the PeopleSoft Application Designer is also visible.
Note. PeopleSoft Application Designer does not provide a method for you to track the change history of a text definition or external file. Developers must keep track of the changes made during the merge process.
Moving Lines of Code into the Output Window
|
Click the arrow button to insert lines of code from window A: or B: into the output window. This button only appears next to lines of code in the A: and B: windows that are unique to that definition or file. |
|
Click this button to remove from the output window lines of code that exist only in the A: definition or file. |
|
Click this button to remove from the output window lines of code that exist only in the B: definition or file. |
|
Use the Previous Difference and Next Difference buttons to navigate quickly between the differences flagged within the active window. |
Saving Merged PeopleCode
After you are satisfied with PeopleCode in the output window that you have merged, click Save to save the changes to the database specified as the Save Output Destination.
After you have successfully saved the merged PeopleCode, to view the merged PeopleCode as it appears in the Saved Output Destination, click the line in the output window indicating that the PeopleCode was successfully saved.
Saving Merged External Files
After you are satisfied with the content of the output window, click Save to save the changes to the file specified as the Save Output Destination in the Merge Properties. To view the results, navigate to the directory containing the file and open it using the appropriate program.
This section discusses how to:
Access the Merge Properties dialog box.
View and set merge properties.
You access the Merge Properties dialog box after first running the merge process. Then you select File, Definition Properties.
If you change any properties, and click OK, PeopleSoft Application Designer applies those to the current merge results. Your merge property changes are applied to all future merge results.
This section discusses how to:
Set Merge properties.
View "A" and "B" properties.
Setting Merge Properties
Access the Merge Properties dialog box and select the Merge tab.
Initial Output View |
Select the definition you want to appear in the output window of the compare interface. Typically, you set the Initial Output View to contain the definition that would have the most modifications to accept. Either "A" or "B" can be selected. |
Save Output Destination |
Select the location where the system saves the contents of the merged output window. The location you select appears on the title bar of the output window. Note. You cannot save the output to a file. |
Colors |
Specify the colors that the system should associate with each definition to enhance readability.
|
View "A" and "B" Properties
Access the Merge Properties dialog box and select either the "A" or "B" tab.
The "A" and "B" tabs display the properties for the current A and B definitions, respectively. These settings are read-only.
Note. PeopleCode definitions do not possess description or Owner ID properties, so these properties appear blank for PeopleCode definitions.
This section provides an overview and discusses how to .
Run a Project PeopleCode Diff/Merge.
Use the Project PeopleCode Diff/Merge interface.
Running a Project PeopleCode Diff/Merge enables you to compare all the PeopleCode definitions in your upgrade project with another database or file simultaneously. If you have numerous PeopleCode definitions to compare and merge, this feature can save you time.
Note. The Project PeopleCode Diff/Merge feature is only available for PeopleCode definitions. For SQL, HTML, and XSLT definitions, you need to merge each definition separately.
To run a Project PeopleCode Diff/Merge:
Select Tools, Diff/Merge Project PeopleCode.
Select either:
Database: select this option if you are comparing definitions with another database. The system will prompt you to sign on to the appropriate database.
File: select this option if you are comparing definitions existing in a file. The system will prompt you to navigate to the appropriate file.
After running the Project PeopleCode Diff/Merge process a blank merge interface appears and the PeopleCode Diff List window appears at the bottom of the Application Designer workspace.
The Item column contains the reference to every PeopleCode definition in the project.
The Diff column indicates whether the comparison between the two definitions uncovered any differences. If there is no difference between the two definitions, the word “identical” appears in the Diff column. If there are differences between the two definitions, the word “different” appears in the Diff column, and indicates which definition is more recent. If the definition appears in only one location, the Diff column text will read "A only" or "B only.” If the definition is not present in either location the Diff column text will read "Absent in both.”
When differences are found, the system highlights the row in red also. A and B only lines appear in blue.
Double-click a row in the PeopleCode Diff List to populate the merge interface above and view the differences between the two definitions.
See Also
When working with numerous PeopleCode definitions, for ease of use you may need to reduce the number of rows appearing in the diff list. To filter what appears in the diff list, select or deselect these items from the View menu.
Show Identical Items |
Show items that are identical in both data sources. |
Show A-Only Items |
Show items that exist only in the A: data source. |
Show B-Only Items |
Show items that exist only in B: data source. |
Show Different Items |
Show items where a difference is found between the two data sources. |
Show Absent Items |
Show items where a definition is absent in either data source. |