From 89ae39188d1e5bdc4a2d22371daa6cb452015135 Mon Sep 17 00:00:00 2001
From: josch <josch@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Wed, 9 Apr 2008 14:16:57 +0000
Subject: [PATCH] added queue length for videos not processed yet and cleaned
 up video.pl

git-svn-id: http://yolanda.mister-muffin.de/svn@288 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/locale/en-us.xml |  1 +
 trunk/video.pl         | 77 ++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 931d47d..e12eb59 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -80,6 +80,7 @@
     <string id="information_registered">Your account has been created.</string>
     <string id="information_uploaded">Your file has been uploaded.</string>
     <string id="information_settings_changed">Your successfully changed your settings.</string>
+    <string id="information_video_not_yet_available">The video being requested is not yet available. The overall sum of video queued is:</string>
 
     <!-- warnings -->
     <string id="warning_no_results">There are no results satisfying your query.</string>
diff --git a/trunk/video.pl b/trunk/video.pl
index aa5ee8e..151b567 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -18,56 +18,42 @@ if($query->url_param('action') eq 'bookmark' and $query->url_param('id'))
     $page->{'message'}->{'type'} = "information";
 }
 #check if id or title is passed
-if($query->url_param('title') or $query->url_param('id'))
+if($query->url_param('id'))
 {
-    if($query->url_param('id'))
-    {
-        #if id is passed ignore title and check for the id
-        $dbquery = "select v.id, v.title, v.description, u.username, from_unixtime( v.timestamp ),
-                            v.creator, v.subject, v.source, v.language, v.coverage, v.rights,
-                            v.license, filesize, duration, width, height, fps, viewcount, downloadcount
-                            from videos as v, users as u where v.id = ? and u.id=v.userid";
-                            
-        @args = ($query->url_param('id'));
-    }
-    else
-    {
-        #if no id was passed there has to be a title we search for
-        $dbquery = "select v.id, v.title, v.description, u.username, from_unixtime( v.timestamp ),
-                            v.creator, v.subject, v.source, v.language, v.coverage, v.rights,
-                            v.license, filesize, duration, width, height, fps, viewcount, downloadcount
-                            from videos as v, users as u where v.title = ? and u.id=v.userid";
-                            
-        @args = ($query->url_param('title'));
-    }
+    $dbquery = "select v.id, v.title, v.description, u.username, from_unixtime( v.timestamp ),
+                        v.creator, v.subject, v.source, v.language, v.coverage, v.rights,
+                        v.license, filesize, duration, width, height, fps, viewcount, downloadcount
+                        from videos as v, users as u where v.id = ? and u.id=v.userid";
+                        
+    @args = ($query->url_param('id'));
     
     $sth = $dbh->prepare($dbquery);
     $rowcount = $sth->execute(@args) or die $dbh->errstr;
     
-    #if the args are wrong there my be zero results
-    #if there was a title passed, then perform a search
-    if($rowcount == 0 and $query->url_param('title'))
-    {
-        $dbquery = "select v.id, v.title, v.description, u.username,
-            from_unixtime( v.timestamp ), v.creator, v.subject, 
-            v.source, v.language, v.coverage, v.rights, v.license, filesize,
-            duration, width, height, fps, viewcount, downloadcount, 1";
-        $dbquery .= ", match(v.title, v.description, v.subject) against( ? in boolean mode) as relevance";
-        $dbquery .= " from videos as v, users as u where u.id = v.userid";
-        $dbquery .= " and match(v.title, v.description, v.subject) against( ? in boolean mode)";
-        
-        @args = ($query->url_param('title'), $query->url_param('title'));
-        
-        $sth = $dbh->prepare($dbquery);
-        $rowcount = $sth->execute(@args) or die $dbh->errstr;
-    }
-    
-    #from this point on, do not use $query->param('id') anymore - we do not know what was given
+    #if there are still no results
     if($rowcount == 0)
     {
-        #still no results
-        #there is nothing we can do now - this video doesn't exist...    
-        print $query->redirect("/index.pl?error=error_no_video");
+        #check if maybe the video has not yet been converted
+        $dbquery = "select id from uploaded where id = ?";
+        $sth = $dbh->prepare($dbquery);
+        $rowcount = $sth->execute($query->url_param('id')) or die $dbh->errstr;
+        
+        #if id is found
+        if($rowcount == 1)
+        {
+            $sth = $dbh->prepare("select sum(duration) from uploaded");
+            $sth->execute() or die $dbh->errstr;
+            ($length) = $sth->fetchrow_array();
+            $h = int($length/3600);
+            $m = int($length/60-$h*60);
+            $s = int($length-$m*60-$h*3600);
+            print $query->redirect("/index.pl?information=information_video_not_yet_available&value=".$h."h ".$m."m ".$s."s");
+        }
+        else
+        {
+            #there is nothing we can do now - this video doesn't exist...    
+            print $query->redirect("/index.pl?error=error_no_video");
+        }
     }
     elsif($rowcount == 1)
     {
@@ -220,11 +206,6 @@ if($query->url_param('title') or $query->url_param('id'))
         }
         print output_page();
     }
-    else
-    {
-        #when an ambigous title was passed there may me many results
-        #redirect to an appropriate search or throw an error with a link to such a search
-    }
 }
 else
 {