[Meshdb-cvs] www/db2 map3b.php,1.4.2.1,1.4.2.2

[<le...@pr...>]

Update of /cvsroot/meshdb/www/db2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17182

Modified Files:
      Tag: leonard-dev
	map3b.php 
Log Message:
use LOS when a nodeid is selected

Index: map3b.php
===================================================================
RCS file: /cvsroot/meshdb/www/db2/map3b.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- map3b.php	7 Nov 2004 05:50:06 -0000	1.4.2.1
+++ map3b.php	21 Jan 2005 16:07:26 -0000	1.4.2.2
@@ -12,12 +12,12 @@
 include("config.php");
 include("util.php");
 
-$e = doubleval($e);
-$n = doubleval($n);
-$w = intval($w);
-$h = intval($h);
-$s = doubleval($s);
-$vrml = intval($vrml);
+$e = doubleval($_GET["e"]);
+$n = doubleval($_GET["n"]);
+$w = intval($_GET["w"]);
+$h = intval($_GET["h"]);
+$s = doubleval($_GET["s"]);
+$vrml = intval($_GET["vrml"]);
 $maxage = intval($_GET["maxage"]);
 if (!$maxage)
     $maxage = $PREF["maxnodeage"];
@@ -38,15 +38,17 @@
 if ($vrml)
 	header("Content-type: model/vrml");
 else
-	header("Content-type: image/png");
+	header("Content-type: image/jpeg");
 if ($REQUEST_METHOD == "HEAD") exit;
 
+debug("w=$w h=$h s=$s");
 $De = $w / $s / 2;
 $Dn = $h / $s / 2;
 $q = "SELECT"
     ."   admin.nodeid AS nodeid,"
     ."   e,"
-    ."   n"
+    ."   n,"
+    ."   h"
     ." FROM admin,physloc"
     ." WHERE admin.nodeid = physloc.nodeid"
     ."   AND n>".($n-$Dn)
@@ -58,17 +60,25 @@
 $c = "";
 $result = mysql_query($q, $db);
 while ($row = mysql_fetch_assoc($result)) {
-	if (isset($t[$row["nodeid"]]))
+	if (isset($t[$row["nodeid"]])) {
 		$x = $t[$row["nodeid"]];
-	else 
+		if ($x == "X" && $row["h"]) {
+		   $los = " -l ".$row["h"];
+		}
+	} else 
 		$x = "x";
 	if ($x == 'o' || $x == 'X' || $x == 'x')
 		$c .= " -$x ".doubleval($row["e"])." ".doubleval($row["n"]);
 }
 
+debug("$BINDIR/alt"
+	." -A ${ALTFILE} -S ${SHIFTFILE}"
+	.($vrml ? " -v" : "") . $los
+	." $c -- $e $n $w $h $s");
+
 mypassthru("$BINDIR/alt"
 	." -A ${ALTFILE} -S ${SHIFTFILE}"
-	.($vrml ? " -v" : "")
+	.($vrml ? " -v" : "") . $los
 	." $c -- $e $n $w $h $s");
 
 exit;