--- m/menu.pl	2001/06/28 10:55:30	1.1
+++ m/menu.pl	2001/06/28 18:44:38	1.2
@@ -4,9 +4,9 @@
 use DBI;
 use Image::Magick;
 
-use constant TYPE_NONE => scalar 0;
-use constant TYPE_BULLET => scalar 1;
-use constant TYPE_LINE => scalar 2;
+use constant TYPE_NONE => scalar 2;
+use constant TYPE_BULLET => scalar 3;
+use constant TYPE_LINE => scalar 1;
 
 sub dump_gif {
 	my ($text, $type, $file) = @_;
@@ -18,18 +18,21 @@
 	$image->Set('size' => '125x13');
 	$image->Read('xc:#283880');
 	if ($type == TYPE_BULLET) {
-		$image->Annotate('text' => $text, 'geometry' => '+17+1',
+		$image->Annotate('text' => $text, 'geometry' => '+17+10',
 			'font' => "\@arialbd.ttf", 'pointsize' => 11,
-			'pen' => '#FFFFFF', 'align' => 'left');
-		$image->Blur('radius' => 1);
+			'fill' => '#ffffff', 'align' => 'left');
+#		$image->Annotate('text' => $text, 'geometry' => '+17+1',
+#			'font' => "\@arialbd.ttf", 'pointsize' => 11,
+#			'pen' => '#FFFFFF', 'align' => 'left');
+#		$image->Blur('radius' => 0.1);
 		$image->Draw('primitive' => 'rectangle', 'stroke' => '#00D000',
 			'fill' => '#00D000', 'antialias' => 1, 'points' =>
 			'7,4 10,7');
 	} else {
-		$image->Annotate('text' => $text, 'geometry' => '+3+0',
+		$image->Annotate('text' => $text, 'geometry' => '+3+10',
 			'font' => "\@arialbd.ttf", 'pointsize' => 11,
-			'pen' => '#FFFFFF', 'align' => 'left');
-		$image->Blur('radius' => 1);
+			'fill' => '#FFFFFF', 'align' => 'left');
+#		$image->Blur('radius' => 1);
 		if ($type == TYPE_LINE) {
 			$image->Draw('primitive' => 'line',
 				'stroke' => '#00FF00', 'fill' => '#00FF00',
@@ -66,22 +69,17 @@
 	return "$file";
 }
 
-print "Content-Type: image/gif\n\n";
-dump_gif("NOVOSTI", TYPE_LINE, "-");
-exit $?;
+#print "Content-Type: image/gif\n\n";
+#dump_gif("NOVOSTI", TYPE_LINE, "-");
+#exit $?;
 
-my $dbh = DBI->connect("DBI:Pg:dbname=corp", "", "") ||
+my $dbh = DBI->connect("DBI:Pg:dbname=plivasi", "", "") ||
 	die $DBI::errstr;
-my $sth = $dbh->prepare("SELECT section,item,url FROM menu") ||
+my $sth = $dbh->prepare("SELECT section,item,url,level FROM menu") ||
 	die $dbh->errstr();
 $sth->execute() || die $sth->errstr();
 while (my @arr = $sth->fetchrow_array()) {
-	if (0) {
-		dump_gif($arr[1], TYPE_BULLET);
-	} else {
-		$dbh->do("UPDATE menu SET file='".dump_gif($arr[1], TYPE_BULLET).
-			"' WHERE item='$arr[1]'");
-	}
+	$dbh->do("UPDATE menu SET file='".dump_gif($arr[1], $arr[3])."' WHERE item='$arr[1]'");
 }
 $sth->finish;
 $dbh->disconnect;