From e72249358b99b7eed91411f4ffafb17c254177f0 Mon Sep 17 00:00:00 2001
From: josch <josch@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sat, 20 Oct 2007 01:55:25 +0000
Subject: [PATCH] implemented dc in videos.pl

git-svn-id: http://yolanda.mister-muffin.de/svn@99 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/search.pl |  2 +-
 trunk/video.pl  | 31 ++++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/trunk/search.pl b/trunk/search.pl
index bcd5437..db056fd 100644
--- a/trunk/search.pl
+++ b/trunk/search.pl
@@ -84,7 +84,7 @@ elsif($query->param('sort'))
 	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
 	
 	#prepare query
-	my $sth = $dbh->prepare(qq{select id, title, description, userid, timestamp from videos order by timestamp desc }) or die $dbh->errstr;
+	my $sth = $dbh->prepare(qq{select id, title, description, userid, from_unixtime( timestamp ) from videos order by timestamp desc }) or die $dbh->errstr;
 	
 	#execute it
 	$sth->execute($query->param('query')) or die $dbh->errstr;
diff --git a/trunk/video.pl b/trunk/video.pl
index 4fbd8c9..337899c 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -25,21 +25,26 @@ if($query->param('title') or $query->param('id'))
 	if($query->param('id'))
 	{
 		#prepare query
-		$sth = $dbh->prepare(qq{select id, title, description, userid, from_unixtime( timestamp ) from videos where id = ? }) or die $dbh->errstr;
+		$sth = $dbh->prepare(qq{select id, title, description, userid, from_unixtime( timestamp ),
+							creator, subject, contributor, source, language, coverage, rights, license
+							from videos where id = ? }) or die $dbh->errstr;
 		#execute it
 		$rowcount = $sth->execute($query->param('id')) or die $dbh->errstr;
 	}
 	else
 	{
 		#prepare query
-		$sth = $dbh->prepare(qq{select id, title, description, userid, from_unixtime( timestamp ) from videos where title = ? }) or die $dbh->errstr;
+		$sth = $dbh->prepare(qq{select id, title, description, userid, from_unixtime( timestamp ),
+							creator, subject, contributor, source, language, coverage, rights, license
+							from videos where title = ? }) or die $dbh->errstr;
 		#execute it
 		$rowcount = $sth->execute($query->param('title')) or die $dbh->errstr;
 	}
 	
 	if($rowcount == 1)
 	{
-		my ($id, $title, $description, $userid, $timestamp) = $sth->fetchrow_array();
+		my ($id, $title, $description, $userid, $timestamp, $creator, $subject,
+			$contributor, $source, $language, $coverage, $rights, $license,) = $sth->fetchrow_array();
 
 		#before code cleanup, this was a really obfuscated array/hash creation
 		push @{ $page->{'video'} },
@@ -49,15 +54,23 @@ if($query->param('title') or $query->param('id'))
 			{
 				'cc:Work'		=>
 				{
-					'rdf:about'		=> "./videos/$id",
-					'dc:title'		=> [$title],
-					'dc:date'		=> [$timestamp],
-					'dc:publisher'	=> [get_username_from_id($userid)],
-					'dc:description'=> [$description]
+					'rdf:about'			=> "./videos/$id",
+					'dc:title'			=> [$title],
+					'dc:creator'		=> [$creator],
+					'dc:subject'		=> [$subject],
+					'dc:description'	=> [$description],
+					'dc:publisher'		=> [get_username_from_id($userid)],
+					'dc:contributor'	=> [$contributor],
+					'dc:date'			=> [$timestamp],
+					'dc:identifier'		=> ["./videos/$id"],
+					'dc:source'			=> [$source],
+					'dc:language'		=> [$language],
+					'dc:coverage'		=> [$coverage],
+					'dc:rights'			=> [$rights]
 				},
 				'cc:License'	=>
 				{
-					'rdf:about' 	=> 'http://creativecommons.org/licenses/GPL/2.0/'
+					'rdf:about' 	=> $license
 				}
 			}
 		};