Changeset 4087 in genesis for tools

Timestamp:

Mar 17, 2005, 12:28:41 PM (20 years ago)

Author:

rick

Message:

Fixed some error's, make more generic

Location:

tools

Files:

• g_list.pl (modified) (19 diffs)
• wleiden.pl (modified) (1 diff)

tools/g_list.pl

@@ -22 +22 @@
 
 #path variablen
-my $home="/home/wleiden/genesis";
+my $home="/home/genesis";
 my $ndir="$home/nodes";
 my $toolfile="$home/tools/wleiden.pl";
@@ -44 +44 @@
 #REQUEST parsen
 $request=$ENV{'REQUEST_URI'};
-if ($request=~/cgi-bin\/g_list.pl\/(.*)$/) {
+if( $request=~/cgi-bin\/g_list.pl\/(.*)$/) {
   ($node,$file)=split(/\//,$1);
   $title="$node $file";
@@ -56 +56 @@
 #en zorgen dan er de nodige tags geprint worden
 $browser=$ENV{'HTTP_USER_AGENT'};
-if ($browser=~/curl|wget|fetch/i) {
+if( $browser=~/curl|wget|fetch/i) {
   $HTML=0;
   printline("Content-type: text/html\n\n");
@@ -70 +70 @@
 
 #als geen node gespecificeerd dan kijken of svn geupdate is gevraagd
-if ($node eq '') {
-  if ($ENV{"QUERY_STRING"}=~/update/i) {
+if( $node eq '') {
+  if( $ENV{"QUERY_STRING"}=~/update/i) {
     select(STDERR); $| = 1;     # make unbuffered
     select(STDOUT); $| = 1;     # make unbuffered
@@ -88 +88 @@
 }
 else {
-  if ($file eq '') {
+  if( $file eq '') {
     foreach $file ( sort @filelist) {
-      if ($HTML) {
+      if( $HTML) {
         print "$file<BR>\n";
       }
@@ -98 +98 @@
     };
   }
-  elsif ($file eq 'config') {
+  elsif( $file eq 'config') {
     g_print($hostname);
   }
@@ -111 +111 @@
 
 #plaats de sluit HTML tags
-if ($HTML) {
+if( $HTML) {
   print <<EOF;
 </BODY>
@@ -121 +121 @@
 #Het opbouwen van het begin scherm
 sub g_list {
-  if ($HTML) {
+  if( $HTML) {
     my $svn_version=svn_version("$ndir");
-    if ($svn_version=~/Last Changed Rev: (\d+)/) {
+    if( $svn_version=~/Last Changed Rev: (\d+)/) {
       $revision=$1;
     };
@@ -139 +139 @@
   closedir DIR;
   foreach $dir (sort @dirs) {
-    if ($dir=~/attic/) {
+    if( $dir=~/attic/ ) {
       next;
     };
     my $node = $dir;
-    if (! $HTML) {
+    if( ! $HTML ) {
       print "$node\n";
     }
@@ -151 +151 @@
         printline("<TD><A HREF=g_list.pl/$node/$file>$file</A></TD>\n");
       };
-      printline("</TABLE><P>");
-    };
+    };
+  };
+  if( $HTML ) {
+    printline("</TABLE><P>");
   };
 };
@@ -163 +165 @@
   local($svn_version);
   $svn_version=`$svn info $file`;
-  if ($char ne '') {
+  if( $char ne '' ) {
     $svn_version=~s/^([^$char].*)/$char $1/mgi;
   };
@@ -181 +183 @@
 
  my $TP='';
- if ($tproxy !~ m/no/i) {
+ if( $tproxy !~ m/no/i ) {
    $TP .= "\n";
    $TP .= "Tproxy on cidr range $tproxy";
@@ -210 +212 @@
  printline("</PRE></TD></TR>");
 
- foreach $if (sort keys %config) {
-   if ($if=~/^(.*):\d+/) {
+ foreach $if( sort keys %config) {
+   if( $if=~/^(.*):\d+/ ) {
      $subs{$1}++;
    };
  };
 
- foreach $if (sort keys %config) {
-   if ($if=~/^([^:]+)/) {
+ foreach $if( sort keys %config) {
+   if( $if=~/^([^:]+)/ ) {
      $mymain=$1;
    }
@@ -224 +226 @@
    };
    
-   if ($if!~/:\d+/) {
+   if( $if!~/:\d+/ ) {
      $main=1;$cc='66'
    }
@@ -232 +234 @@
    };
    
-   if (! ($ip=$IP{$if})) {
+   if(! ($ip=$IP{$if}) ) {
      $ip='dhcp?';
    };
-   if ($TYPE{$if}=~/wireless/) {
+   if( $TYPE{$if}=~/wireless/ ) {
      $color="#${cc}FFFF";
    };
-   if ($TYPE{$if}=~/ethernet/) {
+   if( $TYPE{$if}=~/ethernet/) {
      $color="#FFFF${cc}";
    };
@@ -248 +250 @@
    $cfg=~s/(.*PASS.*=).*/${1}***********/;
 
-   if ($main) {
+   if( $main) {
      printf "<TR bgcolor=$color><TD ROWSPAN=%d VALIGN=TOP><B>$if</TD>\n",(1+$subs{$if})*3,$subs{$if};
      $c=4;
@@ -277 +279 @@
   $svn_versionc=svn_version($config,$char);
 
-  if ($svn_versiont=~/Last Changed Rev: (\d+)/) {
+  if( $svn_versiont=~/Last Changed Rev: (\d+)/ ) {
     $tool_rev=$1;
   };
-  if ($svn_versionc=~/Last Changed Rev: (\d+)/) {
+  if( $svn_versionc=~/Last Changed Rev: (\d+)/ ) {
   $config_rev=$1;
   };
 
-  if ($tool_rev >= $config_rev) {
+  if( $tool_rev >= $config_rev) {
     $svn_version=$svn_versiont . $svn_versionc;
   }
@@ -291 +293 @@
   };
 
-  if ($HTML) {
+  if( $HTML) {
     printline("<H1>Genesis $file voor: $hostname</H1><P>");
   };
@@ -299 +301 @@
 
 
-  if ($HTML) {
+  if( $HTML ) {
     $pr=~s/</&lt;/gi;
     printline("<PRE>$pr</PRE>");

tools/wleiden.pl

@@ -8 +8 @@
 my $author="feb 2003 jasper\@WirelessLeiden.NL \| maart 2005 rick\@WirelessLeiden.NL";
 my $wicontrol='/usr/sbin/wicontrol';
-my $IP_pmPath='/home/rick/svn/genesis/tools/IP.pm';
-my $dnsheader_confPath='/home/rick/svn/genesis/dns/dnsheader.conf';
+my $IP_pmPath='/home/genesis/tools/IP.pm';
+my $dnsheader_confPath='/home/genesis/dns/dnsheader.conf';