[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-34-g99e0160
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:10 CET 2014
The branch, build-baikal has been updated
via 99e016052db1e271859147177688ea5ea8f0f27f (commit)
from d845b630f85954350ff1ff3a767b384976b0a09b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2goserver/lib/x2gosqlitewrapper.pl | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
The diff of changes is:
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 5247fee..a1e5578 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -41,37 +41,34 @@ sub print_result
}
}
-sub print_array
+sub print_result_list
{
- # print all arrays separated by the pipe symbol
- local $, = '|';
- print "THIS IS AN ARRAY!!!!";
- while (<>)
+ while ( shift )
{
- print $_, "\n";
+ print @_, "\n";
}
}
my $result;
+my @result_list;
my $cmd=shift or die "command not specified";
# call the corresponding function in the X2Go::Server:DB:SQLite3 package
switch ($cmd)
{
- case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
- else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
+ case /.*list.*root/ { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+ case /.*list.*/ { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
+ case /.*root/ { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+ else { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
}
-# depending on the type of $result we do different things...
-print $result;
-if ( defined($result) )
+if ( defined(@result_list) )
{
- if ( ref($result) eq "ARRAY" )
- {
- print_array($result);
- } else {
- print_result($result);
- }
+ print_result_list(@result_list);
+}
+elsif ( defined($result) )
+{
+ print_result($result);
}
exit (0);
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list