perfsonar development work

Author: dfn.fritz
Date: 2010-06-08 12:15:28 +0100 (Tue, 08 Jun 2010)
New Revision: 412

Modified:
   
trunk/G2_E2E/G2_E2E_MonitoringSystem/src/Generate_GUI/G2_E2E_GenerateHTML.pm
Log:
PSANALYSIS-229: create horizontal AND vertical view sumiltanously

Modified: 
trunk/G2_E2E/G2_E2E_MonitoringSystem/src/Generate_GUI/G2_E2E_GenerateHTML.pm
===================================================================
--- 
trunk/G2_E2E/G2_E2E_MonitoringSystem/src/Generate_GUI/G2_E2E_GenerateHTML.pm  
      2010-06-08 11:13:49 UTC (rev 411)
+++ 
trunk/G2_E2E/G2_E2E_MonitoringSystem/src/Generate_GUI/G2_E2E_GenerateHTML.pm  
      2010-06-08 11:15:28 UTC (rev 412)
@@ -259,6 +259,8 @@
 
 # prefixes for html files
 my $pic_root                   = "pics/";
+my $html_view_horizontal       = "hor/";
+my $html_view_vertical         = "vert/";
 my $html_fileName_base         = "G2_E2E_";
 my $html_fileName_index        = $html_fileName_base . "index_";
 my $html_fileName_empty        = $html_fileName_base . "empty.html";
@@ -509,8 +511,10 @@
       
     my $html_fileName_view_e2elink_1 =
       GetE2ELinkFileName( $html_root, $e2e_link->getE2ELinkID(), "1" );
-    my $html_fileName_view_e2elink_2 =
-      GetE2ELinkFileName( $html_root, $e2e_link->getE2ELinkID(), "2" );
+    my $html_fileName_view_e2elink_2v =
+      GetE2ELinkFileName( $html_root.$html_view_vertical, 
$e2e_link->getE2ELinkID(), "2" );
+    my $html_fileName_view_e2elink_2h =
+      GetE2ELinkFileName( $html_root.$html_view_horizontal, 
$e2e_link->getE2ELinkID(), "2" );
     my $html_fileName_view_e2elink_3 =
       GetE2ELinkFileName( $html_root, $e2e_link->getE2ELinkID(), "3" );
 
@@ -523,17 +527,24 @@
     }
     print FH $html_header_A;
     print FH "</header>\n"; 
+
+    # Default sub-directory for frame 2 (show E2E Link is horizontal
+    my $subdir = $html_view_horizontal;
     if ( $::SETTINGS_GENERAL {"E2ELINKVIEW"} eq "VERTICAL" ) {
         print FH "<frameset rows=\"200px,60%,* \">\n";
+        $subdir = $html_view_vertical;
     }
     else {
         print FH "<frameset rows=\"200px,40%,* \">\n";
     }
     print FH "  <frame src=\"".GetE2ELinkFileName( "", 
$e2e_link->getE2ELinkID(), "1" )."\" name=\"General\" frameborder=\"0\" 
border=\"0\">\n";
-    print FH "  <frame src=\"".GetE2ELinkFileName( "", 
$e2e_link->getE2ELinkID(), "2" )."\" name=\"E2ELink\" frameborder=\"0\" 
border=\"0\">\n";
+    print FH "  <frame src=\"".GetE2ELinkFileName( $subdir, 
$e2e_link->getE2ELinkID(), "2" )."\" name=\"E2ELink\" frameborder=\"0\" 
border=\"0\">\n";
     print FH "  <frame src=\"".GetE2ELinkFileName( "", 
$e2e_link->getE2ELinkID(), "3" )."\" name=\"Alarms\" frameborder=\"0\" 
border=\"0\">\n";
     print FH "</frameset>\n";
     
+    print "Sbudir: $subdir\n";
+    print "Filename: ".GetE2ELinkFileName( $subdir, 
$e2e_link->getE2ELinkID(), "2" )."\n";
+
     print FH $html_trailer;
     close FH;
     chmod 0664,$html_fileName_view_e2elink;
@@ -563,11 +574,11 @@
     close FH;
     chmod 0664,$html_fileName_view_e2elink_1;
 
-    # Write E2E Link Part
-    if (!open( FH, ">" . $html_fileName_view_e2elink_2))
+    # Write E2E Link Part (horizontal)
+    if (!open( FH, ">" . $html_fileName_view_e2elink_2h))
     {
-        ::writeLogMessage ($G2_E2E_Errors::err_file_open_failed . " 
$html_fileName_view_e2elink_2 \n");
-               push @{$::err_hash{"SYSTEM"}}, 
$G2_E2E_Errors::err_file_open_failed . $html_fileName_view_e2elink_2; 
+        ::writeLogMessage ($G2_E2E_Errors::err_file_open_failed . " 
$html_fileName_view_e2elink_2h \n");
+               push @{$::err_hash{"SYSTEM"}}, 
$G2_E2E_Errors::err_file_open_failed . $html_fileName_view_e2elink_2h; 
         return;
     }
 
@@ -578,17 +589,33 @@
       . GetE2ELinkFileName( "", $e2e_link->getE2ELinkID(), "2" ) . '">';
     print FH $html_header_B;
     
-    if ( $::SETTINGS_GENERAL {"E2ELINKVIEW"} eq "VERTICAL" ) {
-        print FH GenerateView_E2ELink_Semigraphical_vertical("", $e2e_link);
-    }    
-    else
+    print FH GenerateView_E2ELink_Semigraphical("", $e2e_link);
+
+    print FH $html_trailer;
+    close FH;
+    chmod 0664,$html_fileName_view_e2elink_2h;
+
+
+    # Write E2E Link Part (vertical)
+    if (!open( FH, ">" . $html_fileName_view_e2elink_2v))
     {
-        print FH GenerateView_E2ELink_Semigraphical("", $e2e_link);
+        ::writeLogMessage ($G2_E2E_Errors::err_file_open_failed . " 
$html_fileName_view_e2elink_2v \n");
+               push @{$::err_hash{"SYSTEM"}}, 
$G2_E2E_Errors::err_file_open_failed . $html_fileName_view_e2elink_2v; 
+        return;
     }
 
+    print FH $html_header_A;
+    print FH '<meta http-equiv="refresh" content="'
+      . $::SETTINGS_GENERAL {"REFRESHTIME"}
+      . '; URL='
+      . GetE2ELinkFileName( "", $e2e_link->getE2ELinkID(), "2" ) . '">';
+    print FH $html_header_B;
+    
+        print FH GenerateView_E2ELink_Semigraphical_vertical("", $e2e_link);
+
     print FH $html_trailer;
     close FH;
-    chmod 0664,$html_fileName_view_e2elink_2;
+    chmod 0664,$html_fileName_view_e2elink_2v;
 
     # Write Alarms Part
     if (!open( FH, ">" . $html_fileName_view_e2elink_3))