diff --git a/code/serveur/dump2mysql.sh b/code/serveur/dump2mysql.sh index ed1f6dc..18f6b4c 100644 --- a/code/serveur/dump2mysql.sh +++ b/code/serveur/dump2mysql.sh @@ -27,7 +27,7 @@ cat "$1" \ | iconv -f iso-8859-1 -t utf-8 \ | tr '\r' ' ' \ | sed -e 's/X/XX/g' | sed -e 's/A/Xa/g' | tr '\n' 'A' | sed -e 's/A")/")/g' | tr 'A' '\n' | sed -e 's/Xa/A/g' | sed -e 's/XX/X/g' \ -| pv -s $(wc -c "$1" | cut -d ' ' -f 1) \ +| pv -s $(wc -c < "$1" | cut -d ' ' -f 1) \ | sed -e "s#'#''#g" \ | sed -e 's/\\//g' \ | sed -E -e 's#^// [0-9]+ occurrences of relations ([a-z_]+) \(t=([0-9]+) nom_etendu="([^"]+)" info="([^"]+)"\)$#insert into type_relation(name, num, extended_name, info) values('\''\1'\'', \2, '\''\3'\'', '\''\4'\'');#' \ diff --git a/code/serveur/dump2sqlite.sh b/code/serveur/dump2sqlite.sh index e392264..97ebb83 100644 --- a/code/serveur/dump2sqlite.sh +++ b/code/serveur/dump2sqlite.sh @@ -23,7 +23,7 @@ cat "$1" \ | iconv -f iso-8859-1 -t utf-8 \ | tr '\r' ' ' \ | sed -e 's/X/XX/g' | sed -e 's/A/Xa/g' | tr '\n' 'A' | sed -e 's/A")/")/g' | tr 'A' '\n' | sed -e 's/Xa/A/g' | sed -e 's/XX/X/g' \ -| pv -s $(wc -c "$1" | cut -d ' ' -f 1) \ +| pv -s $(wc -c < "$1" | cut -d ' ' -f 1) \ | sed -E -e "s#'#''#g" \ -e 's#^// [0-9]+ occurrences of relations ([a-z_]+) \(t=([0-9]+) nom_etendu="([^"]+)" info="([^"]+)"\)$#insert into type_relation(name, num, extended_name, info) values('\''\1'\'', \2, '\''\3'\'', '\''\4'\'');#' \ -e 's#^// [0-9]+ occurrences of nodes ([a-z_]+) \(t=([0-9]+)\)$#insert into type_node(name, num) values('\''\1'\'', \2);#' \ diff --git a/code/serveur/php/pticlic.php b/code/serveur/php/pticlic.php index 23568c8..2a717d1 100644 --- a/code/serveur/php/pticlic.php +++ b/code/serveur/php/pticlic.php @@ -76,6 +76,7 @@ function create_game($cloudSize) { } create_game(10); +echo "ok"; // // Sinon tout est bon on effectu l'opération correspondant à la commande passée. // if($action == 0) // "Get partie" diff --git a/organisation/pticlic.gan b/organisation/pticlic.gan index 094d060..2fed70e 100644 --- a/organisation/pticlic.gan +++ b/organisation/pticlic.gan @@ -36,11 +36,11 @@ - + - + @@ -171,94 +171,94 @@ - - - - - - + + + + + + - + - - - - - - + + + - - - + + + + + + - + - - - - - - + + + - - - + + + + + + - - + + - - - - - - + + + - - - + + + - - - + + + + + + - - + - - - + - - - + + + - - - + + + + + + diff --git a/rapport/rapport.tex b/rapport/rapport.tex index 25582ac..721279d 100644 --- a/rapport/rapport.tex +++ b/rapport/rapport.tex @@ -116,6 +116,12 @@ Android Developer, 2011. (\url{http://developer.android.com/}) +\section{Notes Georges} +Les relations suivantes seront peut-être utilisées (* = oui, c'est sûr) +r_carac 17 +r_agent 13 +r_patient 14 +* r_syn 5 \newpage