www

commit 4667d9a3f7549d28d49edc2d90e291227e7f1f45
parent 9abd8854bb3a81ff21a3924690f291807d2caa3d
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Thu,  3 Feb 2011 11:07:47 +0100

Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter

Diffstat:
M
code/serveur/dump2sqlite.sh
 | 
2
+-
M
code/serveur/php/pticlic.php
 | 
29
++++++++++++++++++++---------

2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/code/serveur/dump2sqlite.sh b/code/serveur/dump2sqlite.sh
@@ -15,7 +15,7 @@ create table node(eid integer primary key autoincrement, name, type, weight);
 create table relation(rid integer primary key autoincrement, start, end, type, weight);
 create table type_node(name, num);
 create table type_relation(name, num, extended_name, info);
-create table user(login primary key, mail, hash_passwd);
+create table user(login primary key, mail, hash_passwd, score);
 create table game(gid integer primary key autoincrement, eid_central_word, relation_1, relation_2, difficulty);
 create table game_cloud(gid, num, difficulty, eid_word, totalWeight, probaR1, probaR2, probaR0, probaTrash);
 create table played_game(pgid integer primary key autoincrement, gid, login);
diff --git a/code/serveur/php/pticlic.php b/code/serveur/php/pticlic.php
@@ -12,16 +12,16 @@ function mDie($err,$msg)
 	exit;
 }
 
-if (!$db = new SQLite3('db')) {
+if (!$db = new SQlite3($SQL_DBNAME)) {
 	mDie(1,"Erreur lors de l'ouverture de la base de données SQLite3");
 }
 
 function initdb() {
 	global $db;
-	$db->exec("insert into user(login, mail, hash_passwd) values('foo', 'foo@isp.com', '".md5('bar')."');");
+	$db->exec("insert into user(login, mail, hash_passwd, score) values('foo', 'foo@isp.com', '".md5('bar')."', 0);");
 }
 
-if ($do_initdb) initdb();
+if ($do_initdb) { initdb(); }
 
 if(!isset($_GET['action']) || !isset($_GET['user']) || !isset($_GET['passwd']))
 	mDie(2,"La requête est incomplète");
@@ -179,8 +179,6 @@ function create_game($cloudSize) {
 	cg_insert($centerEid, $cloud, $r1, $r2, $totalDifficulty);
 }
 
-//create_game(10);
-
 function random_game() {
 	global $db;
 	return $db->querySingle("select gid from game where gid = (abs(random()) % (select max(gid) from game))+1 or gid = (select max(gid) from game where gid > 0) order by gid limit 1;");
@@ -196,15 +194,26 @@ function game2json($game_id) {
 	echo "cloudsize:10,cloud:["; // TODO ! compter dynamiquement.
 	
 	$res = $db->query("select eid_word,(select name from node where eid=eid_word) as name_word from game_cloud where gid = ".$game['gid'].";");
+	$notfirst = false;
 	while ($x = $res->fetchArray()) {
-		echo "{id:".$x['eid_word'].",name:".$x['name_word']."}\n";
+		if ($notfirst) { echo ","; } else { $notfirst=true; }
+		echo "{id:".$x['eid_word'].",name:".$x['name_word']."}";
 	}
 	echo "]}";
 }
 
-function main() {
+function main($action) {
 	// Sinon tout est bon on effectu l'opération correspondant à la commande passée.
-	if($action == 0) { // "Get partie"
+	// TODO : en production, utiliser : header("Content-Type: application/json; charset=utf-8");
+	header("Content-Type: text/plain; charset=utf-8");
+	if  ($action == 2) { // "Create partie"
+		if(!isset($_GET['nb']) || !isset($_GET['mode']))
+			mDie(2,"La requête est incomplète");
+		$nbParties = intval($_GET['nb']);
+		for ($i = 0; $i < $nbParties; $i++) {
+			create_game(10);
+		}
+	} else if ($action == 0) { // "Get partie"
 		if(!isset($_GET['nb']) || !isset($_GET['mode']))
 			mDie(2,"La requête est incomplète");
 		$nbGames = intval($_GET['nb']);
@@ -241,5 +250,7 @@ function main() {
 		die("Commande inconnue");
 	}
 }
-	
+
+main($action);
+
 ?>