[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-34-g99e0160

[X2Go dev team]

The branch, master 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 -----------------------------------------------------------------
commit 99e016052db1e271859147177688ea5ea8f0f27f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 00:47:13 2012 +0200

    update wrapper script, last commit was the test version

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/lib/x2gosqlitewrapper.pl |   31 ++++++++++++++-----------------
 1 files 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).