ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/DecentralizedMedia/MediaFolder.cpp
(Generate patch)

Comparing DecentralizedMedia/MediaFolder.cpp (file contents):
Revision 500 by douglas, 2005-06-17T23:23:46-07:00 vs.
Revision 549 by douglas, 2005-07-04T21:28:02-07:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 < #include "MediaFolder.hpp"
7 > #include <menes/standard.hh>
8 >
9 > #include <menes/dbi/resultset.hpp>
10  
11 < #include <menes-dbi/resultset.hpp>
11 > #include "MediaFolder.hpp"
12  
13 < MediaFolder::MediaFolder(_H<dbi::Connection>& connection, const api::Path& path) : connection(connection), path(path)
13 > MediaFolder::MediaFolder(const _R<dbi::Connection>& connection, const api::Path& path) : connection(connection), path(path)
14   {
15 <        _H<dbi::ResultSet> root_(connection->Parse(_B("SELECT root FROM folders WHERE path = ?"))->Execute(path.GetPath()));
15 >        _R<dbi::ResultSet> root_(connection->Parse(_B("SELECT root FROM folders WHERE path = ?"))->Execute(path.GetPath()));
16  
17          if (root_->MoveNext())
18                  root = root_->GetString(_B("root"));
17 –        else
18 –                throw;
19   }
20  
21 < MediaFolder::MediaFolder(_H<dbi::Connection>& connection, const api::Path& path, const api::Path& root) : connection(connection), path(path), root(root)
21 > MediaFolder::MediaFolder(const _R<dbi::Connection>& connection, const api::Path& path, const api::Path& root) : connection(connection), path(path), root(root)
22   {
23 <        _H<dbi::ResultSet> path_(connection->Parse(_B("SELECT path FROM folders WHERE path = ?"))->Execute(path.GetPath()));
23 >        _R<dbi::ResultSet> path_(connection->Parse(_B("SELECT path FROM folders WHERE path = ?"))->Execute(path.GetPath()));
24  
25          if (path_->MoveNext())
26                  if (path.GetPath() != root.GetPath())
# Line 36 | Line 36 | MediaFolder::MediaFolder(_H<dbi::Connect
36  
37   _L<MediaFile> MediaFolder::GetFiles() const
38   {
39 <        _H<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM files WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
39 >        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM files WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
40          _L<MediaFile> files;
41  
42          while (paths->MoveNext())
# Line 47 | Line 47 | _L<MediaFile> MediaFolder::GetFiles() co
47  
48   _L<MediaFolder> MediaFolder::GetFolders() const
49   {
50 <        _H<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM folders WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
50 >        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM folders WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
51          _L<MediaFolder> folders;
52  
53          while (paths->MoveNext())

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines