# HG changeset patch
# User devi
# Date 1116932172 -10800
# Node ID 7d4d067f9823504e756fe5b16cf5d3b333241f4b
# Parent  774de5c1ad004a3c45d53fa71ddf0ddcc7137db3
Добавился параметр --classfile
для указания точного пути к файлу класса

diff -r 774de5c1ad00 -r 7d4d067f9823 lm
--- a/lm	Tue May 24 13:35:21 2005 +0300
+++ b/lm	Tue May 24 13:56:12 2005 +0300
@@ -38,6 +38,7 @@
 
 	"class" 	=> "class", 				# Имя файла класса
 	"class_suffix" 	=> ".xml", 				# Cуффикс файла класса
+	"classfile"	=> "",
 
 	"sshkey"	=> "$ENV{HOME}/.ssh/id_dsa.pub",
 	"lmssh"		=> "./lm-ssh",
@@ -152,6 +153,7 @@
 sub load_class
 {
 	my $classfile =
+	$Config{"classfile"} || 
 	$Config{"path_classes"}."/".$Config{"class"}.$Config{"class_suffix"};
 	$XMLClass = XMLin($classfile , ForceArray => [ 'student' ] )  
 		or die "Can't open file of the class ",$classfile,"\n";
@@ -328,6 +330,31 @@
 	my $instructor = $XMLClass->{"instructor"}->{"firstname"}." ".$XMLClass->{"instructor"}->{"surname"};
 	my $course_name = $XMLCourse->{"fullname"}[0];
 
+
+	# Собственно журналы
+
+	for my $student (@{$XMLClass->{"student"}}) {
+		my $user = $student->{"user"};
+		my $hostname = $student->{"host"};
+		my $encoding = $student->{"encoding"};
+
+		system("mkdir -p $webdir/$date/$hostname");
+		system("cp ".$Config{"path_share"}."/*.{ico,css} $webdir/$date/$hostname");
+		system($Config{"l3-report"}.
+			" --input ".$Config{"path_lablogs"}."/$course/$date/$hostname/$user".
+			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/$user ".
+				   $Config{"path_lablogs"}."/$course/$date/$hostname/root".
+			" --output $webdir/$date/$hostname/$user.html".
+			" --encoding $encoding"
+		);
+		system($Config{"l3-report"}.
+			" --input ".$Config{"path_lablogs"}."/$course/$date/$hostname/root".
+			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/root ".
+			" --output $webdir/$date/$hostname/root.html".
+			" --encoding $encoding"
+		);
+	}
+
 	# Индекс для данного класса
 
 	my $head;
@@ -367,31 +394,6 @@
 	</html>
 TAIL
 	close (HTML);
-	exit;
-
-	# Собственно журналы
-
-	for my $student (@{$XMLClass->{"student"}}) {
-		my $user = $student->{"user"};
-		my $hostname = $student->{"host"};
-		my $encoding = $student->{"encoding"};
-
-		system("mkdir -p $webdir/$date/$hostname");
-		system("cp ".$Config{"path_share"}."/*.{ico,css} $webdir/$date/$hostname");
-		system($Config{"l3-report"}.
-			" --input ".$Config{"path_lablogs"}."/$course/$date/$hostname/$user".
-			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/$user ".
-				   $Config{"path_lablogs"}."/$course/$date/$hostname/root".
-			" --output $webdir/$date/$hostname/$user.html".
-			" --encoding $encoding"
-		);
-		system($Config{"l3-report"}.
-			" --input ".$Config{"path_lablogs"}."/$course/$date/$hostname/root".
-			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/root ".
-			" --output $webdir/$date/$hostname/root.html".
-			" --encoding $encoding"
-		);
-	}