From 642a65535239655d52dca8747310bbe9ee80123a Mon Sep 17 00:00:00 2001
From: MEUNIER Thibaud <thibaud.meunier@laposte.net>
Date: Sun, 30 Dec 2018 18:31:18 +0100
Subject: [PATCH] erreur sur final_hash et modif block2.sh

---
 methode/hashes2hashes/robot.php |  6 ++++--
 scripts/blocks2.sh              | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/methode/hashes2hashes/robot.php b/methode/hashes2hashes/robot.php
index 4e2326e..a8b6a01 100644
--- a/methode/hashes2hashes/robot.php
+++ b/methode/hashes2hashes/robot.php
@@ -49,10 +49,12 @@ for($i=0; $i<$nb_max; $i++)
 {
   $the_block = blockchain::getBlockWithHash($block_hash);
   if ($the_block === FALSE) die();
-  
-  $hash=DATA_PATH.'/hashes/'.$the_block->hash.'.png';
+ 
   $block_hash = $the_block->prev_block;
 
+  $hash=DATA_PATH.'/hashes/'.$the_block->hash.'.png';
+  if ($final_hash  == 'default') $final_hash = $hash;
+
   if (file_exists($hash))
   {
     $src_img = imagecreatefrompng($hash);
diff --git a/scripts/blocks2.sh b/scripts/blocks2.sh
index 8b3a99d..7b408f1 100755
--- a/scripts/blocks2.sh
+++ b/scripts/blocks2.sh
@@ -59,7 +59,16 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
   #
   # CHOISIR UNE METHODE2 AU HASARD
   #
-  for METHODE in `ls $APPS_PATH/methode2 | grep -v robot | shuf | head -n 1`
+  # LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf`
+  # LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf | head -n 1`
+  # en rajoutant le head, on ne fait qu'un seul dessin 
+  LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v robot | shuf | head -n 1`
+  if [ $HEIGHT -eq 1 ]
+  then
+    LISTE_METHODE=`ls $APPS_PATH/methode2 | grep -v treemap | grep -v robot | shuf | head -n 1`
+  fi
+
+  for METHODE in $LISTE_METHODE
   do
     if [ ! -d $DATA_PATH/$METHODE ]
     then
@@ -71,6 +80,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
       cd $APPS_PATH/methode2
       php robot.php $METHODE $BLOCK $((RANDOM % 6)) $2
       cp $DATA_PATH/last/$BLOCK.png $DATA_PATH/$METHODE/$BLOCK.png
+      cd - >> /dev/null
     fi
   done