Changeset 2775

Timestamp:

09/22/10 21:43:13 (3 years ago)

Author:

azerttyu

Message:

Determiner le chemin selectionné depuis l'image

• Extraire les coordonnées ISMAP de la carte
• Calculer le chemin depuis les coordonnées

Location:

alternc-philesight/trunk

Files:

• usr/lib/alternc/philesight (modified) (5 diffs)
• var/alternc/bureau/admin/philesight_view.php (modified) (1 diff)
• var/alternc/bureau/class/philesight.php (modified) (4 diffs)

alternc-philesight/trunk/usr/lib/alternc/philesight

@@ -13 +13 @@
         [ "--dump",                "-u", GetoptLong::NO_ARGUMENT       ],
         [ "--one-file-system", "-1", GetoptLong::NO_ARGUMENT       ],
-        [ "--help",            "-h", GetoptLong::NO_ARGUMENT       ]
+        [ "--help",            "-h", GetoptLong::NO_ARGUMENT       ],
+        [ "--find",            "-f", GetoptLong::REQUIRED_ARGUMENT  ]
 )
 
@@ -28 +29 @@
         puts "  --one-file-system  Skip mount points"
         puts "  --skip <path>      Skip given filename in index mode"
+        puts "  --find x,y         Determine path from x,y"
         puts
         puts "Examples:"
@@ -49 +51 @@
 arg_skip = ""
 arg_drawfile = ""
-
+arg_x = ""
+arg_y = ""
 
 opts.each do |opt, arg|
@@ -78 +81 @@
                 mode = "dump"
 
+        when "--find"
+                mode = "find"
+                if(arg =~  /(\d+),(\d+)/) then
+                        arg_x = $1.to_i
+                        arg_y = $2.to_i
+                end
         else
                 usage
@@ -111 +120 @@
                 t.index(arg_index_dir, arg_skip, arg_one_fs)
 
+        when "find"
+                puts t.find(arg_path, arg_x, arg_y)
         else
                 usage()

alternc-philesight/trunk/var/alternc/bureau/admin/philesight_view.php

@@ -43 +43 @@
 <br />
 <?php
-                # Get parameters from environment and CGI.
+                $phil = new Philesight();
 
-                $phil = new Philesight();
-                $phil->initialize();
+                # Get parameters from environment and CGI. 
+                # Get path by default
+                $path = $_GET['path'] ? $_GET['path'] : "/";
+
+                # ISMAP image maps do not return a proper CGI parameter, but only the
+                # coordinates appended after a question mark. If this is found in the
+                # QUERY_STRING, assume the 'find' command
+
+                $qs = $_SERVER["QUERY_STRING"];
+                if (qs && preg_match("/\?(\d+,\d+)/",$qs,$matches)) {
+                        $coordinates = $matches['1'];
+                        $path = $phil->find_path($path,$coordinates);
+                }
+
+                $phil->initialize($path);
 ?>
 </body>

alternc-philesight/trunk/var/alternc/bureau/class/philesight.php

@@ -25 +25 @@
         private $path_db = '/var/alternc/philesight/server.db';
 
-        public function initialize() {
-                echo $this->do_image('/');
+        public function initialize($path) {
+
+                $path = $path ? $path : "/";
+                echo "<a href='".$_SERVER['PHP_SELF']."?path=".$path."&amp;'>";
+                        echo $this->do_image($path);
+                echo "</a>";
         }
 
@@ -52 +56 @@
          */
         protected function run_command($command) {
+
                 $descriptorspec = array(
                         1 => array('pipe', 'w'),
@@ -72 +77 @@
 
         protected function do_image($path = "/") {
-
-                $fname = $this->run("--db ".$this->path_db." --path ".$path." --draw /tmp/page.png");
                 $file = '/tmp/page.png';
+                $fname = $this->run("--db '".$this->path_db."' --path '".trim($path)."' --draw '".$file."'");
                 $image = imagecreatefrompng($file);
                 imagealphablending($image, false);
@@ -85 +89 @@
                 ob_end_clean();
                 imagedestroy($image);
-                return "<img src='data:image/png;base64,".base64_encode($content)."' />";
+                return "<img src='data:image/png;base64,".base64_encode($content)."' ismap='ismap' alt='".$path."'/>";
+        }
+
+        public function find_path($path_parent = "/",$coordinates) {
+                $path = $this->run("--db ".$this->path_db." --path ".$path_parent." --find ".$coordinates);
+                return $path;
         }
 }