suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yoann 2011-04-14 11:15:47 +02:00
commit aa0ffc7e1a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/html5/pticlic.js
View File

@ -59,7 +59,7 @@ function jss() {
}
$(function () {
var url = "tmp.json";
var url = "http://www.pticlic.fr/unstable/code/serveur/php/server.php?action=0&nb=1&user=foo&passwd=bar&mode=normal";
$.getJSON(url, function(data) {
var game = data[0];
var currentWordNb = 0;

10
code/serveur/php/pticlic.php
View File

@ -358,6 +358,7 @@ function formatWord($word) {
*/
function game2json($user, $gameId)
{
global $stringRelations;
$db = getDB();
// TODO : factoriser avec game2array() .
// TODO : planter si la requête suivante échoue pour quelque raison que ce soit.
@ -367,9 +368,14 @@ function game2json($user, $gameId)
// TODO Yoann : faire des tests d'erreur pour ces select ?
$game = $db->query("select gid, (select name from node where eid = eid_central_word) as name_central_word, eid_central_word, relation_1, relation_2 from game where gid = ".$gameId.";");
$game = $game->fetchArray();
$retstr = "";
$retstr .= '{"gid":'.$gameId.',"pgid":'.$pgid.',"cat1":'.$game['relation_1'].',"cat2":'.$game['relation_2'].',"cat3":0,"cat4":-1,';
$retstr .= '{"gid":'.$gameId.',"pgid":'.$pgid.',"relations":[';
$retstr .= '{"id":'.$game['relation_1'].', "name":'.json_encode(''.formatWord($stringRelations[$game['relation_1']])).'}';
$retstr .= ', {"id":'.$game['relation_2'].', "name":'.json_encode(''.formatWord($stringRelations[$game['relation_2']])).'}';
$retstr .= ', {"id":0, "name":'.json_encode(''.formatWord($stringRelations[0])).'}';
$retstr .= ', {"id":-1, "name":'.json_encode(''.formatWord($stringRelations[-1])).'}],';
// $retstr .= '{"gid":'.$gameId.',"pgid":'.$pgid.',"cat1":'.$game['relation_1'].',"cat2":'.$game['relation_2'].',"cat3":0,"cat4":-1,';
$retstr .= '"center":{"id":'.$game['eid_central_word'].',"name":'.json_encode(''.formatWord($game['name_central_word'])).'},';
$retstr .= '"cloudsize":10,"cloud":['; // TODO ! compter dynamiquement.