lilalo

changeset 35:5f60fe514d49

*** empty log message ***
author devi
date Mon Nov 14 13:57:48 2005 +0200 (2005-11-14)
parents 34f3ce44c365
children cb822611b240
files l3-frontend lm
line diff
     1.1 --- a/l3-frontend	Mon Nov 14 09:17:49 2005 +0200
     1.2 +++ b/l3-frontend	Mon Nov 14 13:57:48 2005 +0200
     1.3 @@ -161,7 +161,7 @@
     1.4  		$command =~ s/'//g;
     1.5  		$CommandsFDistribution{$command}++;
     1.6  		if (!$Commands_Description{$command}) {
     1.7 -			my $mywi;
     1.8 +			my $mywi="";
     1.9  			$mywi = mywi_client ($command);
    1.10  			$mywi = join ("\n", grep(/\([18]\)/, split(/\n/, $mywi)));
    1.11  			$mywi =~ s/\s+/ /;
    1.12 @@ -268,8 +268,8 @@
    1.13  	for my $i (@Command_Lines_Index) {
    1.14  
    1.15  		my $cl = \$Command_Lines[$i];
    1.16 -		@{${$cl}->{"new_commands"}} =();
    1.17 -		@{${$cl}->{"new_files"}} =();
    1.18 +		#@{${$cl}->{"new_commands"}} =();
    1.19 +		#@{${$cl}->{"new_files"}} =();
    1.20  		$$cl->{"class"} = ""; 
    1.21  
    1.22  		if ($$cl->{"err"}) {
    1.23 @@ -418,6 +418,10 @@
    1.24  				next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{hostname} eq $filter{hostname};
    1.25  			}
    1.26  
    1.27 +			if ($filter{user}) {
    1.28 +				next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{user} eq $filter{user};
    1.29 +			}
    1.30 +
    1.31  			#for my $filter_field (keys %filter) {
    1.32  			#	next COMMAND_LINE unless $Sessions{$cl->{local_session_id}}->{$filter_field} eq $filter{$filter_field};
    1.33  			#}
    1.34 @@ -445,6 +449,8 @@
    1.35  		if ($cl->{class} eq "note") {
    1.36  			my $note = $cl->{note};
    1.37  			$note = join ("\n", map ("<p>$_</p>", split (/-\n/, $note)));
    1.38 +			$note =~ s@(http:[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.39 +			$note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.40  			$Result{"body"} .= "<tr><td colspan='6'>";
    1.41  			$Result{"body"} .= "<h4 id='note$note_number'>".$cl->{note_title}."</h4>" if $cl->{note_title};
    1.42  			$Result{"body"} .= "".$note."<p/><p/></td></td>";
    1.43 @@ -590,6 +596,8 @@
    1.44  		if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {
    1.45  			my $note=$cl->{"note"};
    1.46  			$note =~ s/\n/<br\/>\n/msg;
    1.47 +			$note =~ s@(http:[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.48 +			$note =~ s@(www\.[a-zA-Z.0-9/?%-]*)@<a href='$1'>$1</a>@g;
    1.49  		#	Ширину пока не используем
    1.50  		#	$Result{"body"} .= "<table width='$Config{note_width}' class='note'>";
    1.51  			$Result{"body"} .= "<table class='note'>";
     2.1 --- a/lm	Mon Nov 14 09:17:49 2005 +0200
     2.2 +++ b/lm	Mon Nov 14 13:57:48 2005 +0200
     2.3 @@ -497,8 +497,8 @@
     2.4  
     2.5  ###install-pm
     2.6  scp PM/* $ssh_user@$host:/tmp
     2.7 -#ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install'
     2.8 -ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
     2.9 +ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install'
    2.10 +#ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
    2.11  
    2.12  ###copy-lablogs
    2.13  for i in $dirs