[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery MgmtQuery.java, 1.2, 1.3 MgmtQueryCommander.java, 1.19, 1.20 MgmtQueryHost.java, 1.11, 1.12 MgmtQueryResult.java, 1.9, 1.10

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19086/net/tinyos/mgmtquery

Modified Files:
	MgmtQuery.java MgmtQueryCommander.java MgmtQueryHost.java 
	MgmtQueryResult.java 
Log Message:
fixed a bug in one-shot RAM queries, now treeBuilder takes the beacon period on the command line

Index: MgmtQuery.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQuery.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgmtQuery.java	24 Aug 2004 23:34:50 -0000	1.2
--- MgmtQuery.java	2 Nov 2004 09:04:47 -0000	1.3
***************
*** 41,43 ****
--- 41,47 ----
      return ramQuery;
    }
+ 
+   public String toString() {
+     return "period=" + samplePeriod + " ramQuery=" + ramQuery + "\n" + keyList;
+   }
  }

Index: MgmtQueryCommander.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryCommander.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MgmtQueryCommander.java	1 Sep 2004 01:32:29 -0000	1.19
--- MgmtQueryCommander.java	2 Nov 2004 09:04:47 -0000	1.20
***************
*** 174,177 ****
--- 174,179 ----
      System.out.println();
  
+     System.out.println(query);
+ 
      if (command.equals("query_oneshot")) {
  

Index: MgmtQueryHost.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryHost.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MgmtQueryHost.java	15 Oct 2004 05:01:44 -0000	1.11
--- MgmtQueryHost.java	2 Nov 2004 09:04:47 -0000	1.12
***************
*** 99,104 ****
      }
  
-     System.out.println(msg);
-     System.out.println(queryMsg);
      send(msg);
    }
--- 99,102 ----
***************
*** 135,138 ****
--- 133,138 ----
      queryMsg.set_msgType((byte)2);
      queryMsg.set_numAttrs((byte)q.numAttrs());
+     if (q.isRAMQuery())
+       queryMsg.set_ramQuery((byte)1);
  
      int i = 0;

Index: MgmtQueryResult.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/mgmtquery/MgmtQueryResult.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgmtQueryResult.java	15 Oct 2004 05:01:44 -0000	1.9
--- MgmtQueryResult.java	2 Nov 2004 09:04:47 -0000	1.10
***************
*** 92,95 ****
--- 92,96 ----
      String ret = ""; 
      ArrayList theValue = (ArrayList)byteValueList.get(columnIndex);    
+     
      for(int i = 0; i < theValue.size(); i++) {
        ret += toByteString(ubyte(((Integer)theValue.get(i)).intValue()));