From 2aa752283b9ca3c724bb02ff4052e4d3ebe87b22 Mon Sep 17 00:00:00 2001
From: erlehmann <erlehmann@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Mon, 15 Oct 2007 00:25:23 +0000
Subject: [PATCH] readability fixes

comments are awsome, thanks josch


git-svn-id: http://yolanda.mister-muffin.de/svn@68 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/include.pl  |  1 +
 trunk/init_sql.pl | 41 +++++++++++++++++++++++++++++++++++++----
 trunk/search.pl   | 20 ++++++++++----------
 trunk/uploader.pl |  1 +
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/trunk/include.pl b/trunk/include.pl
index e230409..4a8974c 100644
--- a/trunk/include.pl
+++ b/trunk/include.pl
@@ -7,6 +7,7 @@ use XML::Simple qw(:strict);
 use Digest::SHA qw(sha256_hex);
 use Encode qw(decode_utf8);
 
+# change this as you install it somewhere else
 $gnutube_root = '/var/www/gnutube';
 
 use lib qw(/var/www/gnutube);
diff --git a/trunk/init_sql.pl b/trunk/init_sql.pl
index 638931c..87307cc 100644
--- a/trunk/init_sql.pl
+++ b/trunk/init_sql.pl
@@ -13,13 +13,46 @@ $dbh->do(qq{drop table videos});
 
 $dbh->do(qq{drop table tagcloud});
 
-$dbh->do(qq{create table tagcloud (text varchar(255) not null, count int not null)});
+$dbh->do(qq{create table
+	tagcloud
+	(
+		text		varchar(255)		not null,
+		count		int					not null
+	)
+});
 
-$dbh->do(qq{insert into tagcloud values ('web tv', 68)});
+$dbh->do(qq{insert into
+	tagcloud values
+	(
+	'web tv', 68
+	)
+});
 
-$dbh->do(qq{create table users (id int auto_increment not null, username varchar(255) not null, password char(41) not null, sid char(32) not null, primary key (id))});
+$dbh->do(qq{create table
+	users
+	(
+		id			int auto_increment	not null,
+		username	varchar(255)		not null,
+		password	char(41)			not null,
+		sid			char(32)			not null,
+		primary key	(id)
+	)
+});
 
-$dbh->do(qq{create table videos (id int auto_increment not null, title varchar(255) not null, caption text not null, userid varchar(255) not null, hash char(64) not null, status int not null, timestamp datetime not null, primary key (id), fulltext (title, caption))});
+$dbh->do(qq{create table
+	videos
+	(
+		id			int auto_increment	not null,
+		title		varchar(255)		not null,
+		caption		text				not null,
+		userid		varchar(255)		not null,
+		hash		char(64)			not null,
+		status		int					not null,
+		timestamp	datetime			not null,
+		primary key	(id),
+		fulltext	(title, caption)
+	)
+});
 
 $dbh->disconnect() or die $dbh->errstr;
 
diff --git a/trunk/search.pl b/trunk/search.pl
index 7520333..d9214e0 100644
--- a/trunk/search.pl
+++ b/trunk/search.pl
@@ -33,22 +33,22 @@ if($query->param('query'))
 	#get every returned value
 	while (my ($title, $caption, $userid, $timestamp) = $sth->fetchrow_array())
 	{
-		#really obfuscated array/hash creation
+		#before code cleanup, this was a really obfuscated array/hash creation
 		push @{ $page->{'results'}->{'result'} },
 		{
-			'thumbnail' => ['./video-stills/225x150/4chan_city_mashup.png'],
-			'rdf:RDF' =>
+			'thumbnail'		=> ['./video-stills/225x150/4chan_city_mashup.png'],
+			'rdf:RDF'		=>
 			{
-				'cc:Work' =>
+				'cc:Work'		=>
 				{
-					'rdf:about' => './videos/1050x700/4chan_city_mashup.ogg',
-					'dc:title' => [$title],
-					'dc:date' => [$timestamp],
-					'dc:publisher' => [get_username_from_id($userid)]
+					'rdf:about'		=> './videos/1050x700/4chan_city_mashup.ogg',
+					'dc:title'		=> [$title],
+					'dc:date'		=> [$timestamp],
+					'dc:publisher'	=> [get_username_from_id($userid)]
 				},
-				'cc:License' =>
+				'cc:License'	=>
 				{
-					'rdf:about' => 'http://creativecommons.org/licenses/GPL/2.0/'
+					'rdf:about' 	=> 'http://creativecommons.org/licenses/GPL/2.0/'
 				}
 			}
 		};
diff --git a/trunk/uploader.pl b/trunk/uploader.pl
index 885ad9b..1b86dd7 100644
--- a/trunk/uploader.pl
+++ b/trunk/uploader.pl
@@ -9,6 +9,7 @@ $session = new CGI::Session;
 sub hook
 {
 	#this is going to become an ajax progress bar
+	#alternatively, reloading every N seconds (mozilla doesn't flicker)
 	my ($filename, $buffer, $bytes_read, $data) = @_;
 	#print $ENV{'CONTENT_LENGTH'};
 	#print sha256_hex($buffer);