+
+
+
+
+
+
+
+
+
diff --git a/code/html5/jquery-1.5.1.min.js b/code/html5/jquery-1.5.1.min.js
new file mode 100644
index 0000000..6437874
--- /dev/null
+++ b/code/html5/jquery-1.5.1.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g
| t |
","
"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1>");try{for(var c=0,e=this.length;c
+
+
+
diff --git a/code/html5/score.js b/code/html5/score.js
new file mode 100644
index 0000000..bd262d3
--- /dev/null
+++ b/code/html5/score.js
@@ -0,0 +1,39 @@
+function jss() {
+ var w, h;
+ w = $(window).width();
+ h = $(window).height();
+
+ var mch = h/8, mnh = h*0.075;
+
+ $("body, html")
+ .css({
+ padding: 0,
+ margin: 0,
+ overflow: "hidden",
+ textAlign: "left"
+ });
+
+ $("#screen")
+ .wh(w, h)
+ .north($("body").north()); // TODO : par rapport à la fenêtre entière.
+}
+
+$(function () {
+ var url = "score.json";
+ $.getJSON(url, function(data) {
+ console.log(data);
+ $.each(data.scores, function(i,e) {
+ var percentScore = (e.score - data.minScore) / (data.maxScore - data.minScore);
+ $("#templates .scoreLine")
+ .clone()
+ .find(".word").text(e.name).end()
+ .find(".score")
+ .text(e.score)
+ .css("color","rgb("+(255 - 255*percentScore).clip(0,255)+","+(191*percentScore).clip(0,255,true)+",0)")
+ .end()
+ .appendTo(".scores");
+ jss();
+ });
+ });
+ jss();
+});
\ No newline at end of file
diff --git a/code/html5/score.json b/code/html5/score.json
new file mode 100644
index 0000000..c03fd73
--- /dev/null
+++ b/code/html5/score.json
@@ -0,0 +1 @@
+{"minScore":-5,"maxScore":10,"scores":[{"id":84632,"name":"camion","score":3},{"id":61939,"name":"transbahutage","score":10},{"id":104263,"name":"trimbaler","score":4},{"id":44654,"name":"transporter","score":-2},{"id":38285,"name":"d\u00e9m\u00e9nageur","score":5},{"id":43404,"name":"porter","score":5},{"id":63192,"name":"transports","score":-1},{"id":130473,"name":"enthousiasmer","score":0},{"id":90461,"name":"se trimbaler","score":6},{"id":134609,"name":"baguenauder","score":9}]}
\ No newline at end of file
diff --git a/code/html5/tmp.json b/code/html5/tmp.json
new file mode 100644
index 0000000..84a661b
--- /dev/null
+++ b/code/html5/tmp.json
@@ -0,0 +1 @@
+[{"gid":22,"pgid":512,"relations":[{"id":10,"name":"%mc fait partie de %mn"},{"id":9,"name":"%mn est une partie de %mc"},{"id":0,"name":"%mc est en rapport avec %mn"},{"id":-1,"name":"%mn n'est pas lié à %mc"}],"center":{"id":28282,"name":"transbahuter"},"cloudsize":10,"cloud":[{"id":84632,"name":"camion"},{"id":61939,"name":"transbahutage"},{"id":104263,"name":"trimbaler"},{"id":44654,"name":"transporter"},{"id":38285,"name":"d\u00e9m\u00e9nageur"},{"id":43404,"name":"porter"},{"id":63192,"name":"transports"},{"id":130473,"name":"enthousiasmer"},{"id":90461,"name":"se trimbaler"},{"id":134609,"name":"baguenauder"}]}]
\ No newline at end of file
diff --git a/code/serveur/php/pticlic.php b/code/serveur/php/pticlic.php
index 7fd5958..25b8152 100644
--- a/code/serveur/php/pticlic.php
+++ b/code/serveur/php/pticlic.php
@@ -2,6 +2,7 @@
require_once("relations.php");
require_once("db.php");
+require_once("ressources/errors.inc")
/* Les prototypes des fonctions :
* ===============================>
@@ -40,7 +41,7 @@ require_once("db.php");
function checkLogin($user, $passwd) {
$db = getDB();
$hashPasswd = md5($passwd);
- $loginIsOk = ($hashPasswd == $db->querySingle("SELECT hash_passwd FROM user WHERE login='".$user."';"));
+ $loginIsOk = ($hashPasswd == $db->querySingle(sqlGetPassword($user)));
return $loginIsOk;
}
@@ -50,7 +51,7 @@ function checkLogin($user, $passwd) {
function randomCenterNode()
{
$db = getDB();
- return $db->querySingle("select eid from random_center_node where rowid = (abs(random()) % (select max(rowid) from random_center_node))+1;");
+ return $db->querySingle(sqlGetEIDCenterNode());
}
/** Selectionne aléatoirement un noeud d'un nuage.
@@ -59,7 +60,7 @@ function randomCenterNode()
function randomCloudNode()
{
$db = getDB();
- return $db->querySingle("select eid from random_cloud_node where rowid = (abs(random()) % (select max(rowid) from random_cloud_node))+1;");
+ return $db->querySingle(sqlGetEIRCloudNode());
}
/**
@@ -75,32 +76,16 @@ function cgBuildResultSets($cloudSize, $centerEid, $r1, $r2)
// Le select doit ranvoyer trois colonnes :
// eid => l'eid du mot à mettre dans le nuage,
// r1 => la probabilité pour que le mot soit dans r1, entre -1 et 1 (négatif = ne devrait pas y être, positif = devrait y être à coup sûr, 0 = on sait pas).
- $typer1r2 = "type in ($r1, $r2)";
- $banned_types = "4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001";
$sources = array(
- // Voisins 1 saut du bon type (= relations déjà existantes)
- array('w'=>40, 'd'=>1, 's'=>"select end as eid, type = $r1 as r1, type = $r2 as r2, 0 as r0, 0 as trash from relation where start = $centerEid and $typer1r2 order by random();"),
- // Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
- array('w'=>40, 'd'=>2, 's'=>"select end as eid, 0.25 as r1, 0.25 as r2, 0.5 as r0, 0 as trash from relation where start = $centerEid and type = 0 order by random();"),
- // Voisins 1 saut via les autres relations
- array('w'=>20, 'd'=>3.1, 's'=>"select end as eid, 0.1 as r1, 0.1 as r2, 0.8 as r0, 0 as trash from relation where start = $centerEid and type not in (0, $r1, $r2, $banned_types) order by random();"),
- // Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
- // Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
- array('w'=>30, 'd'=>3.2, 's'=>"select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3. as r1, ((A.type = $r2) + (B.type = $r2)) / 3. as r2, 1/6. as r0, 1/6. as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();"),
- // Voisins 1 saut r1/r2 + 1 saut synonyme
- // Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random()";
- array('w'=>20, 'd'=>5, 's'=>"select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();"),
- // Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
- array('w'=>20, 'd'=>6, 's'=>"select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();"),
- // Voisins 2 sauts (tous)
- // Version optimisée de : "select end as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from relation where start in (select end from relation where start = $centerEid and type not in ($banned_types)) and type not in ($banned_types) order by random();"
- array('w'=>10, 'd'=>8, 's'=>"select x as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from (select x from (select X.eid + Y.dumb as x from (select B.end as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.start = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();"),
- // Centre pointe vers X, M pointe vers X aussi, on prend M.
- // Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in ($banned_types) order by random();"
- // Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit 1) order by random();"
- // Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
- array('w'=>10, 'd'=>8, 's'=>"select x as eid, 0.1 as r1, 0.1 as r2, 0.2 as r0, 0.6 as trash from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();"),
+ array('w'=>40, 'd'=>1, 's'=>sql1JumpGoodType($r1, $r2, $centerEid)),
+ array('w'=>40, 'd'=>2, 's'=>sql1JumpViaRAssociated0($centerEid)),
+ array('w'=>20, 'd'=>3.1, 's'=>sql1JumpViaOtherRelation($centerEid, $r1, $r2, $banned_types)),
+ array('w'=>30, 'd'=>3.2, 's'=>sql2JumpWithMixR1R2ForLinks($r1, $r2, $centerEid)),
+ array('w'=>20, 'd'=>5, 's'=>sql1JumpR1DivR2Plus1JumpSynonymOneHopWithType($r1, $r2, $centerEid)),
+ array('w'=>20, 'd'=>6, 's'=>sql1JumpR1DivR2Plus1JumpSynonym($r1, $r2, $centerEid)),
+ array('w'=>10, 'd'=>8, 's'=>sql2JumpAll($centerEid, $cloudSize)),
+ array('w'=>10, 'd'=>8, 's'=>sqlXPointsToMMPointsToXTakeM($cloudSize)),
'rand' => array('w'=>5, 'd'=>10, 's'=>false) // random. Le r1 et r2 de random sont juste en-dessous
);
@@ -216,7 +201,7 @@ function cgBuildCloud($centerEid, $cloudSize, $sources, $sumWeights)
$rejected = false;
// Ne pas mettre le mot central dans le nuage.
if ($res['eid'] == $centerEid) { continue; }
- $nodeName = $db->querySingle("select name from node where eid=".$res['eid'].";");
+ $nodeName = $db->querySingle(sqlGetNameFromNode($res));
if (substr($nodeName, 0, 2) == "::") { continue; }
foreach ($cloud as $c) {
if ($c['eid'] == $res['eid']) {
@@ -302,7 +287,7 @@ function cgInsert($centerEid, $cloud, $r1, $r2, $totalDifficulty)
*/
function randomGameCore() {
$db = getDB();
- 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;");
+ return $db->querySingle(sqlGetGidFromGame());
}
/** Sélection aléatoire d'une partie de la base de données parmis les parties à jouer.
@@ -320,7 +305,7 @@ function randomGame()
$gid = randomGameCore();
if ($gid === null)
- throw new Exception("Erreur lors de la récupération de la partie. Vérifiez qu'il y a au moins une partie.", 6);
+ errGetGame();
}
return $gid;
}
@@ -337,11 +322,11 @@ function formatWord($word) {
while (($pos = strpos($word, ">")) !== false) {
$res .= substr($word,0,$pos) . " (";
$eid = intval(substr($word,$pos+1));
- if ($eid == 0) { throw new Exception("Erreur lors du suivi des pointeurs de spécialisation du mot $word.", 7); }
- if (in_array($eid, $stack)) { throw new Exception("Boucle rencontrée lors du suivi des pointeurs de spécialisation du mot $word.", 8); }
- if (count($stack) > 10) { throw new Exception("Trop de niveaux de récursions lors du suivi des pointeurs de spécialisation du mot $word.", 9); }
+ if ($eid == 0) { errFollowingPointer($word); }
+ if (in_array($eid, $stack)) { errLoopDetected($word); }
+ if (count($stack) > 10) { errTooMuchRecursion($word); }
$stack[] = $eid;
- $word = $db->querySingle("select name from node where eid = $eid");
+ $word = $db->querySingle(sqlGetNameFromNodeWithEid($eid));
}
$res .= $word;
@@ -364,8 +349,7 @@ function game2json($user, $gameId)
$db->exec("INSERT INTO played_game(pgid, gid, login, timestamp) VALUES (null, ".$gameId.", '$user', -1);");
$pgid = $db->lastInsertRowID();
- // 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 = $db->query(sqlGetGamesForId($gameId));
$game = $game->fetchArray();
$retstr = "";
@@ -373,7 +357,7 @@ function game2json($user, $gameId)
$retstr .= '"center":{"id":'.$game['eid_central_word'].',"name":'.json_encode(''.formatWord($game['name_central_word'])).'},';
$retstr .= '"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 = ".$gameId.";");
+ $res = $db->query(sqlGetWordEidAndName($gameId));
$notfirst = false;
while ($x = $res->fetchArray())
@@ -403,7 +387,7 @@ function game2array($user, $gameId)
$pgid = $db->lastInsertRowID();
// 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 = $db->query(sqlGetGamesForId($gameId));
$game = $game->fetchArray();
$ret = array();
@@ -416,7 +400,7 @@ function game2array($user, $gameId)
$ret['center'] = array('id' => $game['eid_central_word'], 'name' => formatWord($game['name_central_word']));
$ret['cloud'] = array(); // TODO ! compter dynamiquement.
- $res = $db->query("select eid_word,(select name from node where eid=eid_word) as name_word, num, difficulty, totalWeight, probaR1, probaR2, probaR0, probaTrash from game_cloud where gid = ".$gameId.";");
+ $res = $db->query(sqlGetInformationAboutGame($gameId));
while ($x = $res->fetchArray())
{
@@ -533,11 +517,11 @@ function normalizeProbas($row) {
function setGame($user, $pgid, $gid, $answers)
{
$db = getDB();
- if ('ok' !== $db->querySingle("SELECT 'ok' FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user' and timestamp = -1;")) {
+ if ('ok' !== $db->querySingle(sqlGameIsOK($pgid, $gid, $user))) {
return getGameScores($user, $pgid, $gid);
}
- $userReputation = computeUserReputation($db->querySingle("SELECT score FROM user WHERE login='".$user."';"));
+ $userReputation = computeUserReputation($db->querySingle(sqlGetScoreForUser($user)));
$db->exec("begin transaction;");
$db->exec("update played_game set timestamp = ".time()." where pgid = $pgid;");
@@ -557,7 +541,7 @@ function setGame($user, $pgid, $gid, $answers)
$num = intval($row['num']);
$nbScores++;
if (!isset($answers[$num])) {
- throw new Exception("Cette requête \"Set partie\" ne donne pas de réponse (une relation) pour le mot numéro $num de la partie.", 5);
+ errSetPartiNoRelation($num);
}
$relanswer = intval($answers[$num]);
@@ -567,7 +551,7 @@ function setGame($user, $pgid, $gid, $answers)
case $r2: $answer = 1; $probaRx = "probaR2"; break;
case $r0: $answer = 2; $probaRx = "probaR0"; break;
case $trash: $answer = 3; $probaRx = "probaTrash"; break;
- default: throw new Exception("Réponse ($relanswer) invalide pour le mot $num. Les réponses possibles sont : $r1, $r2, $r0, $trash", 5);
+ default: errAnswerInvalidForWord($r1, $r2, $r0, $trash);
}
$wordScore = computeScore(normalizeProbas($row), $row['difficulty'], $answer, $userReputation);
@@ -589,17 +573,17 @@ function setGame($user, $pgid, $gid, $answers)
function getGameScores($user, $pgid, $gid) {
$db = getDB();
- $timestamp = $db->querySingle("SELECT timestamp FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user';");
+ $timestamp = $db->querySingle(sqlGetPlayedGameTime($pgid, $gid, $user));
if ($timestamp == -1) {
- throw new Exception("Cette partie n'a jamais été jouée.", 4); // TODO : code d'erreur en doublon avec celui ci-dessous.
+ errGameNeverPlayed();
} else if ($timestamp == null) {
- throw new Exception("Cette partie n'est associée à votre nom d'utilisateur.", 4);
+ errGameNotAssociatedWithUser();
}
$gameScore = 0;
$scores = array();
$nbScores = 0;
- $res = $db->query("SELECT num,score from played_game_cloud where pgid = $pgid and gid = $gid;");
+ $res = $db->query(sqlGetNumAndScoreFromGame($pgid, $gid));
while ($row = $res->fetchArray())
{
$nbScores++;
@@ -665,7 +649,7 @@ function setGameGetScore($user, $pgid, $gid, $answers) {
function insertNode($node) {
$db = getDB();
- if($db->querySingle("SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."'") == null) {
+ if($db->querySingle(sqlGetEidFromNode($node)) == null) {
$db->exec("INSERT INTO node(name,type,weight) VALUES('".SQLite3::escapeString($node)."',1,50);");
return true;
}
@@ -681,7 +665,7 @@ function insertNode($node) {
function getNodeEid($node) {
$db = getDB();
- return $db->querySingle("SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."';");
+ return $db->querySingle(sqlGetEidFromNode($node));
}
function wordExist($node) {
diff --git a/code/serveur/php/relations.php b/code/serveur/php/relations.php
index 3932efa..22ce39d 100644
--- a/code/serveur/php/relations.php
+++ b/code/serveur/php/relations.php
@@ -1,45 +1,46 @@
"Mot non lié à 'mot central'",
- 0 => "'mot central' est en rapport avec...",
- //1 => "raffinement sémantique", // pas utilisé
- //2 => "raffinement morphologique", // pas utilisé
- //3 => "domaine", // pas utilisé
- //4 => "r_pos", // pas utilisé
- 5 => "'mot central' est un synonyme de...",
- 6 => "'mot central' est une sorte de...",
- 7 => "Un contraire de 'mot central' est...",
- 8 => "Un spécifique de 'mot central' est...",
- 9 => "... est une partie de 'mot central'",
- 10 => "'mot central' fait partie de...",
- //11 => "locution", // pas utilisé
- //12 => "potentiel de FL", // pas utilisé
- 13 => "Quoi/Qui pourrait 'mot central'",
- //14 => "action>patient", // pas utilisé
- 15 => "Le lieu pour 'mot central' est...",
- 16 => "Un instrument pour 'mot central' est...",
- 17 => "Un caractéristique de 'mot central' est...",
- //18 => "r_data", // pas utilisé
- //19 => "r_lemma", // pas utilisé
- //20 => "magn", // pas utilisé
- //21 => "antimagn", // pas utilisé
- 22 => "'mot central' est de la même famille que...",
- //29 => "predicat", // pas utilisé
- //30 => "lieu>action", // pas utilisé
- //31 => "action>lieu", // pas utilisé
- //32 => "sentiment", // pas utilisé
- //33 => "erreur", // pas utilisé
- //34 => "manière", // pas utilisé
- //35 => "sens/signification", // pas utilisé
- //36 => "information potentielle", // pas utilisé
- //37 => "rôle télique", // pas utilisé
- //38 => "rôle agentif", // pas utilisé
- //41 => "conséquence", // pas utilisé
- //42 => "cause", // pas utilisé
- //52 => "succession", // pas utilisé
- //53 => "produit", // pas utilisé
- //54 => "est le produit de", // pas utilisé
- //55 => "s'oppose à"
- );
+ -1 => "%mn n'est pas lié à %mc",
+ 0 => "%mc est en rapport avec %mn",
+ //1 => "raffinement sémantique", // pas utilisé
+ //2 => "raffinement morphologique", // pas utilisé
+ //3 => "domaine", // pas utilisé
+ //4 => "r_pos", // pas utilisé
+ 5 => "%mc est un synonyme de %mn",
+ 6 => "%mc est une sorte de %mn",
+ 7 => "Un contraire de %mc est %mn",
+ 8 => "Un spécifique de %mc est %mn",
+ 9 => "%mn est une partie de %mc",
+ 10 => "%mc fait partie de %mn",
+ //11 => "locution", // pas utilisé
+ //12 => "potentiel de FL", // pas utilisé
+ 13 => "Quoi/Qui pourrait %mc",
+ //14 => "action>patient", // pas utilisé
+ 15 => "Le lieu pour %mc est %mn",
+ 16 => "Un instrument pour %mc est %mn",
+ 17 => "Un caractéristique de %mc est %mn",
+ //18 => "r_data", // pas utilisé
+ //19 => "r_lemma", // pas utilisé
+ //20 => "magn", // pas utilisé
+ //21 => "antimagn", // pas utilisé
+ 22 => "%mc est de la même famille que %mn",
+ //29 => "predicat", // pas utilisé
+ //30 => "lieu>action", // pas utilisé
+ //31 => "action>lieu", // pas utilisé
+ //32 => "sentiment", // pas utilisé
+ //33 => "erreur", // pas utilisé
+ //34 => "manière", // pas utilisé
+ //35 => "sens/signification", // pas utilisé
+ //36 => "information potentielle", // pas utilisé
+ //37 => "rôle télique", // pas utilisé
+ //38 => "rôle agentif", // pas utilisé
+ //41 => "conséquence", // pas utilisé
+ //42 => "cause", // pas utilisé
+ //52 => "succession", // pas utilisé
+ //53 => "produit", // pas utilisé
+ //54 => "est le produit de", // pas utilisé
+ //55 => "s'oppose à"
+);
+
?>
\ No newline at end of file
diff --git a/code/serveur/php/ressources/errors.inc b/code/serveur/php/ressources/errors.inc
new file mode 100644
index 0000000..e361304
--- /dev/null
+++ b/code/serveur/php/ressources/errors.inc
@@ -0,0 +1,43 @@
+function errRequestIncomplete() {
+ throw new Exception("La requête est incomplète", 1);
+}
+
+function errUserUnknownOrBadPassword() {
+ throw new Exception("Utilisateur non enregistré ou mauvais mot de passe", 2);
+}
+
+function errGameNeverPlayed() {
+ throw new Exception("Cette partie n'a jamais été jouée.", 3); // TODO : code d'erreur en doublon avec celui ci-dessous.
+}
+
+function errGameNotAssociatedWithUser() {
+ throw new Exception("Cette partie n'est pas associée à votre nom d'utilisateur.", 4);
+}
+
+function errAnswerInvalidForWord($r1, $r2, $r0, $trash) {
+ throw new Exception("Réponse ($relanswer) invalide pour le mot $num. Les réponses possibles sont : $r1, $r2, $r0, $trash", 5);
+}
+
+function errSetPartiNoRelation($num) {
+ throw new Exception("Cette requête \"Set partie\" ne donne pas de réponse (une relation) pour le mot numéro $num de la partie.", 6);
+}
+
+function errGetGame() {
+ throw new Exception("Erreur lors de la récupération de la partie. Vérifiez qu'il y a au moins une partie.", 7);
+}
+
+function errFollowingPointer($word) {
+ throw new Exception("Erreur lors du suivi des pointeurs de spécialisation du mot $word.", 8); }
+}
+
+function errLoopDetected($word) {
+ throw new Exception("Boucle rencontrée lors du suivi des pointeurs de spécialisation du mot $word.", 9); }
+}
+
+function errTooMuchRecursion($word) {
+ throw new Exception("Trop de niveaux de récursions lors du suivi des pointeurs de spécialisation du mot $word.", 10); }
+}
+
+function errUnknownCommand() {
+ throw new Exception("Commande inconnue", 11);
+}
diff --git a/code/serveur/php/ressources/sql.inc b/code/serveur/php/ressources/sql.inc
new file mode 100644
index 0000000..f93a00c
--- /dev/null
+++ b/code/serveur/php/ressources/sql.inc
@@ -0,0 +1,119 @@
+$typer1r2 = "type in ($r1, $r2)";
+$banned_types = "4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001";
+
+function sqlGetPassword($user) {
+ return "SELECT hash_passwd FROM user WHERE login='".$user."';";
+}
+
+function sqlGetEIDCenterNode() {
+ return "select eid from random_center_node where rowid = (abs(random()) % (select max(rowid) from random_center_node))+1;";
+}
+
+function sqlGetEIRCloudNode() {
+ return "select eid from random_cloud_node where rowid = (abs(random()) % (select max(rowid) from random_cloud_node))+1;";
+}
+
+// Voisins 1 saut du bon type (= relations déjà existantes)
+function sql1JumpGoodType($r1, $r2, $centerEid) {
+ global $typer1r2;
+
+ return "select end as eid, type = $r1 as r1, type = $r2 as r2, 0 as r0, 0 as trash from relation where start = $centerEid and $typer1r2 order by random();";
+}
+
+// Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
+function sql1JumpViaRAssociated0($centerEid) {
+ return "select end as eid, 0.25 as r1, 0.25 as r2, 0.5 as r0, 0 as trash from relation where start = $centerEid and type = 0 order by random();";
+}
+
+// Voisins 1 saut via les autres relations
+function sql1JumpViaOtherRelation($centerEid, $r1, $r2) {
+ global $banned_types;
+
+ return "select end as eid, 0.1 as r1, 0.1 as r2, 0.8 as r0, 0 as trash from relation where start = $centerEid and type not in (0, $r1, $r2, $banned_types) order by random();";
+}
+
+// Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
+// Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
+function sql2JumpWithMixR1R2ForLinks($r1, $r2, $centerEid) {
+ global $typer1r2;
+
+ return "select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3. as r1, ((A.type = $r2) + (B.type = $r2)) / 3. as r2, 1/6. as r0, 1/6. as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();";
+}
+
+// Voisins 1 saut r1/r2 + 1 saut synonyme
+// Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random()";
+function sql1JumpR1DivR2Plus1JumpSynonymOneHopWithType($r1, $r2, $centerEid) {
+ global $typer1r2;
+
+ return "select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();";
+}
+
+// Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
+function sql1JumpR1DivR2Plus1JumpSynonym($r1, $r2, $centerEid) {
+ global $typer1r2;
+
+ return "select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();";
+}
+
+// Voisins 2 sauts (tous)
+// Version optimisée de : "select end as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from relation where start in (select end from relation where start = $centerEid and type not in ($banned_types)) and type not in ($banned_types) order by random();"
+function sql2JumpAll($centerEid, $cloudSize) {
+ global $banned_types;
+
+ return "select x as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from (select x from (select X.eid + Y.dumb as x from (select B.end as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.start = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();";
+}
+
+// Centre pointe vers X, M pointe vers X aussi, on prend M.
+// Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in ($banned_types) order by random();"
+// Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit 1) order by random();"
+// Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
+function sqlXPointsToMMPointsToXTakeM($cloudSize) {
+ global $banned_types;
+
+ return "select x as eid, 0.1 as r1, 0.1 as r2, 0.2 as r0, 0.6 as trash from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();";
+}
+
+function sqlGetNameFromNode($res) {
+ return "select name from node where eid=".$res['eid'].";";
+}
+
+function sqlGetGidFromGame() {
+ return "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;";
+}
+
+function sqlGetNameFromNodeWithEid($eid) {
+ return "select name from node where eid = $eid";
+}
+
+// TODO Yoann : faire des tests d'erreur pour ces select ?
+function sqlGetGamesForId($gameId) {
+ return "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.";";
+}
+
+function sqlGetWordEidAndName($gameId) {
+ return "select eid_word,(select name from node where eid=eid_word) as name_word from game_cloud where gid = ".$gameId.";";
+}
+
+function sqlGetInformationAboutGame($gameId) {
+ return "select eid_word,(select name from node where eid=eid_word) as name_word, num, difficulty, totalWeight, probaR1, probaR2, probaR0, probaTrash from game_cloud where gid = ".$gameId.";";
+}
+
+function sqlGameIsOK($pgid, $gid, $user) {
+ return "SELECT 'ok' FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user' and timestamp = -1;";
+}
+
+function sqlGetScoreForUser($user) {
+ return "SELECT score FROM user WHERE login='".$user."';";
+}
+
+function sqlGetPlayedGameTime($pgid, $gid, $user) {
+ return "SELECT timestamp FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user';";
+}
+
+function sqlGetNumAndScoreFromGame($pgid, $gid) {
+ return "SELECT num,score from played_game_cloud where pgid = $pgid and gid = $gid;";
+}
+
+function sqlGetEidFromNode($node) {
+ return "SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."'";
+}
\ No newline at end of file
diff --git a/code/serveur/php/server.php b/code/serveur/php/server.php
index 9d107e4..35e7f96 100644
--- a/code/serveur/php/server.php
+++ b/code/serveur/php/server.php
@@ -31,7 +31,7 @@ function logError($errNum, $msg, $other="")
function main()
{
if(!isset($_GET['action']) || !isset($_GET['user']) || !isset($_GET['passwd'])) {
- throw new Exception("La requête est incomplète", 2);
+ errRequestIncomplete();
}
// Login
@@ -39,7 +39,7 @@ function main()
$user = SQLite3::escapeString($_GET['user']);
$loginIsOk = checkLogin($user, $_GET['passwd']);
if ($action != 3 && (!$loginIsOk)) {
- throw new Exception("Utilisateur non enregistré ou mauvais mot de passe", 3);
+ errUserUnknownOrBadPassword();
}
if ($action == 3) {
echo '{"login_ok":' . ($loginIsOk ? 'true' : 'false') . '}';
@@ -53,7 +53,7 @@ function main()
if ($action == 2) { // "Create partie"
// Requête POST : http://serveur/server.php?action=2&nb=2&mode=normal&user=foo&passwd=bar
if (!isset($_GET['nb']) || !isset($_GET['mode'])) {
- throw new Exception("La requête est incomplète", 2);
+ errRequestIncomplete();
}
createGame(intval($_GET['nb']), $_GET['mode']);
echo '{"success":1}';
@@ -61,14 +61,14 @@ function main()
else if($action == 0) { // "Get partie"
// Requête POST : http://serveur/server.php?action=0&nb=2&mode=normal&user=foo&passwd=bar
if(!isset($_GET['nb']) || !isset($_GET['mode'])) {
- throw new Exception("La requête est incomplète", 2);
+ errRequestIncomplete();
}
getGame($user, intval($_GET['nb']), $_GET['mode']);
}
else if($action == 1) { // "Set partie"
// Requête POST : http://serveur/server.php?action=1&mode=normal&user=foo&passwd=bar&gid=1234&pgid=12357&0=0&1=-1&2=22&3=13&9=-1
if (!isset($_GET['pgid']) || !isset($_GET['gid'])) {
- throw new Exception("La requête est incomplète", 2);
+ errRequestIncomplete();
}
// TODO : il faudrait filtrer les paramètres qui correspondent à une réponse
// au lieu d'envoyer $_GET en entier, mais on ne connaît pas leur nom à l'avance.
@@ -76,7 +76,7 @@ function main()
}
else if($action == 4) { // CheckWord
if (!isset($_GET['word']))
- throw new Exception("La requête est incomplète", 2);
+ errRequestIncomplete();
if(wordExist($_GET['word']))
echo true;
@@ -87,10 +87,8 @@ function main()
echo getGameRelationsJSON();
}
else {
- throw new Exception("Commande inconnue", 2);
- }
-
-
+ errUnknownCommand();
+ }
}
function server() {
diff --git a/organisation/notes b/organisation/notes
index 29ae082..93eb672 100644
--- a/organisation/notes
+++ b/organisation/notes
@@ -1,3 +1,5 @@
+2010-03-29 : TODO : s'assurer dans le serveur que les mots du nuage sont envoyés dans l'ordre, et que les num sont *toujours* entre 0..n
+
NOTES DES PREMIERES REUNIONS (IL ME SEMBLE)
GEORGES'S NOTEBOOK (en vrac)
@@ -68,7 +70,6 @@ version glisser-déposer le mot sur relation
******************
-
BUG : dans les parties qu'on génère, la somme des poids doit toujours être 2, or il y en a certaines où c'est 0 !?!