Attachment 64522 Details for Bug 170263 – ParserWrapper patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] ParserWrapper patch

ParserWrapper_patch (text/plain), 2.62 KB, created by Cindy Jin

on 2007-04-21 22:17:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2007-04-21 22:17:07 EDT

Size: 2.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.parsers
>Index: src.import/org/eclipse/hyades/logging/parsers/importer/ParserWrapper.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src.import/org/eclipse/hyades/logging/parsers/importer/ParserWrapper.java,v
>retrieving revision 1.19
>diff -u -r1.19 ParserWrapper.java
>--- src.import/org/eclipse/hyades/logging/parsers/importer/ParserWrapper.java	23 Aug 2006 06:05:29 -0000	1.19
>+++ src.import/org/eclipse/hyades/logging/parsers/importer/ParserWrapper.java	22 Apr 2007 02:16:31 -0000
>@@ -737,15 +737,19 @@
> 		String tempWindowsFile = "windows.txt";
> 		String newConverter = converter;
> 		
>+		
>+		
>+	
>         // If this is the Windows application/security/system event log parser then create the converter command
>         /* Use the config file directory and converter command (bugzilla 145830) to determine if this is a Windows 
> 		 * application/security/system event log parser.
> 		 */
> 		int winIndex = configFileDirectory.lastIndexOf("Windows\\");
>+		
> 		int evtTypeIndex = winIndex+8;   /* Index of the type of event log located immediately after "Windows\" in the config path */
> 		
>         if (winIndex != -1 && ((configFileDirectory.substring(evtTypeIndex).indexOf("application") == 0) || (configFileDirectory.substring(evtTypeIndex).indexOf("security") == 0) || (configFileDirectory.substring(evtTypeIndex).indexOf("system") == 0))
>-        		&& converter.indexOf("eventlogreader.exe") != -1) {
>+        		&&( converter.indexOf("eventlogreader.exe") != -1|| converter.indexOf("EventLogReader2.exe") != -1)) {
> 
>             // Create a temporary file to hold the output of the converter.
>             File tempFile;
>@@ -796,7 +800,15 @@
>             	
>             
>             // Create the new converter command		
>+            
>+            if(converter.indexOf("EventLogReader2.exe") != -1)
>+            {
>+            	  newConverter = "\"".concat(baseFileDirectory).concat(ParserConstants.FILE_SEPARATOR).concat("eventlogreader2.exe\" \"").concat(windowsEventLog).concat("\" \"").concat(tempFile.getAbsolutePath()).concat("\"");
>+            }
>+            else
>+            {
>             newConverter = "\"".concat(baseFileDirectory).concat(ParserConstants.FILE_SEPARATOR).concat("eventlogreader.exe\" \"").concat(windowsEventLog).concat("\" \"").concat(tempFile.getAbsolutePath()).concat("\"");
>+            }
> 
>             // set the new file to parse the text file that will be the output of the converter command
>             newFileName = tempFile.getName();

Actions: View | Diff

Attachments on bug 170263: 63951 | 63952 | 63953 | 63954 | 64520 | 64521 | 64522