oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

orderByClause added.

Browse source
This commit is contained in:
Matthew Wilson 2005-05-12 21:22:51 +00:00
parent de96f89ec9
commit 3abef2feb1
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/WebGUI/Asset.pm
View file

@ -1394,8 +1394,11 @@ sub getLineage {
$columns = "*"; $columns = "*";
$slavedb = WebGUI::SQL->getSlave; $slavedb = WebGUI::SQL->getSlave;
} }
my $sortOrder = ($rules->{invertTree}) ? "desc" : "asc"; my $sortOrder = ($rules->{invertTree}) ? "lineage desc" : "lineage asc";
my $sql = "select $columns from $tables where $where order by lineage $sortOrder"; if (exists $rules->{orderByClause}) {
$sortOrder = $rules->{orderByClause};
}
my $sql = "select $columns from $tables where $where order by $sortOrder";
my @lineage; my @lineage;
my %relativeCache; my %relativeCache;
my $sth = WebGUI::SQL->read($sql, $slavedb); my $sth = WebGUI::SQL->read($sql, $slavedb);
@ -1952,26 +1955,26 @@ Optional string representing a URL.
sub newByUrl { sub newByUrl {
my $class = shift; my $class = shift;
my $url = shift || $session{env}{PATH_INFO}; my $url = shift || $session{env}{PATH_INFO};
$url = lc($url); $url = lc($url);
$url =~ s/\/$//; $url =~ s/\/$//;
$url =~ s/^\///; $url =~ s/^\///;
$url =~ s/\'//; $url =~ s/\'//;
$url =~ s/\"//; $url =~ s/\"//;
my $asset; my $asset;
if ($url ne "") { if ($url ne "") {
my $asset = WebGUI::Cache->new("asseturl_".$url)->get; my $asset = WebGUI::Cache->new("asseturl_".$url)->get;
unless (exists $asset->{assetId}) { unless (exists $asset->{assetId}) {
$asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where url=".quote($url)); $asset = WebGUI::SQL->quickHashRef("select assetId, className from asset where url=".quote($url));
WebGUI::Cache->new("asseturl_".$url)->set($asset,3600); WebGUI::Cache->new("asseturl_".$url)->set($asset,3600);
} }
if ($asset->{assetId} ne "" || $asset->{className} ne "") { if ($asset->{assetId} ne "" || $asset->{className} ne "") {
return WebGUI::Asset->newByDynamicClass($asset->{assetId}, $asset->{className}); return WebGUI::Asset->newByDynamicClass($asset->{assetId}, $asset->{className});
} else { } else {
return $class->newByDynamicClass($session{setting}{notFoundPage}); return $class->newByDynamicClass($session{setting}{notFoundPage});
} }
} }
return $class->newByDynamicClass($session{setting}{defaultPage}); return $class->newByDynamicClass($session{setting}{defaultPage});
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------