Menu
▾
▴
witrack-svn — Mailing list devoted to commit emails from the SVN
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(9) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <th...@us...> - 2009-01-29 19:01:57
|
Revision: 40
http://witrack.svn.sourceforge.net/witrack/?rev=40&view=rev
Author: thibnes
Date: 2009-01-29 19:01:55 +0000 (Thu, 29 Jan 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java
trunk/Server/net/witrack/server/DeviceWorker.java
Modified: trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java
===================================================================
--- trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java 2008-06-17 02:46:45 UTC (rev 39)
+++ trunk/Manager/src/net/witrack/manager/wps/WavePropagationSimulator.java 2009-01-29 19:01:55 UTC (rev 40)
@@ -97,7 +97,7 @@
//_grid = new Box[_nbBoxY][_nbBoxX];
_grid = new Box[_nbBoxY][_nbBoxX];
_maxpower = -10;
- _minpower = -60; // avant modif tom =>> 40
+ _minpower = -80;
_coef_color_asc = 255 / -((double)(_minpower - _maxpower) / 2);
_coef_color_desc = -_coef_color_asc;
_scale = 5;
Modified: trunk/Server/net/witrack/server/DeviceWorker.java
===================================================================
--- trunk/Server/net/witrack/server/DeviceWorker.java 2008-06-17 02:46:45 UTC (rev 39)
+++ trunk/Server/net/witrack/server/DeviceWorker.java 2009-01-29 19:01:55 UTC (rev 40)
@@ -190,7 +190,7 @@
Integer building = new Integer(0);
Integer map = new Integer(0);
int delta = 2 ;
- int match = 3;
+ int match = 3; //Means that the client see at leat 3 APs.
//apList example : 000EA6B7DC46:-77;001217DFAEC2:-76
@@ -210,9 +210,11 @@
// verifie si l'AP est connu
try
{
- statement = con.createStatement();
- ResultSet res = statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b WHERE m.building_id=b.building_id and m.map_id=ap.map_id ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
+ statement = con.createStatement();
+ //ResultSet res = statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b WHERE m.building_id=b.building_id and m.map_id=ap.map_id and ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
+ ResultSet res = statement.executeQuery("SELECT ap.ap_id, ap.map_id, b.building_id, b.area_id FROM ap, buildings b, maps m WHERE m.building_id=b.building_id and m.map_id=ap.map_id and ap.ap_macaddr='" + Addslashes.addslahes(oneAp[0])+"'");
+ /*
if (Math.abs(power) < bestPower && res.next())
{
allApKnown.add(oneAp);
@@ -226,6 +228,23 @@
{
allApKnown.add(oneAp);
}
+ */
+
+ if (power > bestPower && res.next())
+ {
+ allApKnown.add(oneAp);
+ bestPower = power;
+ bestAP = oneAp[0];
+ map = new Integer(res.getInt("map_id"));
+ building = new Integer(res.getInt("building_id"));
+ area = new Integer(res.getInt("area_id"));
+
+ //System.err.println(area.toString() + " " + building.toString() + " " + map.toString());
+ }
+ else if (res.next())
+ {
+ allApKnown.add(oneAp);
+ }
}
catch (SQLException e1) {
e1.printStackTrace();
@@ -269,7 +288,7 @@
try
{
statement = con.createStatement();
- System.out.println("SQL STATMENT " + sqlStament);
+ //System.out.println("SQL STATMENT " + sqlStament);
ResultSet res = statement.executeQuery(sqlStament);
if (res.next())
@@ -279,7 +298,7 @@
}
else
{
- System.err.println("\nPAS DE POS TROUVEE\n");
+ System.err.println("\nNo positions found\n");
}
}
catch (SQLException e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:46:50
|
Revision: 39
http://witrack.svn.sourceforge.net/witrack/?rev=39&view=rev
Author: thibnes
Date: 2008-06-16 19:46:45 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/witrack_create_db.sql
Removed Paths:
-------------
trunk/Server/witrack_create_db.sql
Deleted: trunk/Server/witrack_create_db.sql
===================================================================
--- trunk/Server/witrack_create_db.sql 2008-06-17 02:46:15 UTC (rev 38)
+++ trunk/Server/witrack_create_db.sql 2008-06-17 02:46:45 UTC (rev 39)
@@ -1,228 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 2.11.4
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Jun 07, 2008 at 04:32 PM
--- Server version: 5.0.51
--- PHP Version: 5.2.5
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
---
--- Database: `witrack`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ap`
---
-
-CREATE TABLE IF NOT EXISTS `ap` (
- `ap_id` int(10) unsigned NOT NULL auto_increment,
- `ap_macaddr` varchar(17) default NULL,
- `ap_modelref` varchar(30) default NULL,
- `ap_label` varchar(20) default NULL,
- `ap_protocol` varchar(15) default NULL,
- `ap_ssid` varchar(30) default NULL,
- `ap_ipaddress` varchar(25) default NULL,
- `ap_x` double NOT NULL default '0',
- `ap_y` double NOT NULL default '0',
- `map_id` int(11) NOT NULL default '0',
- `ap_strength` double NOT NULL default '0',
- `ap_description` text NOT NULL,
- PRIMARY KEY (`ap_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
-
---
--- Dumping data for table `ap`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `areas`
---
-
-CREATE TABLE IF NOT EXISTS `areas` (
- `area_id` int(11) NOT NULL auto_increment,
- `area_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`area_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `areas`
---
-
-INSERT INTO `areas` (`area_id`, `area_name`) VALUES
-(1, 'School');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `buildings`
---
-
-CREATE TABLE IF NOT EXISTS `buildings` (
- `building_id` int(11) NOT NULL auto_increment,
- `building_name` varchar(45) NOT NULL default '',
- `area_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`building_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `buildings`
---
-
-INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
-(1, 'Building1', 1);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `devices`
---
-
-CREATE TABLE IF NOT EXISTS `devices` (
- `dev_id` int(10) unsigned NOT NULL auto_increment,
- `dev_macaddr` varchar(17) default NULL,
- `dev_passkey` varchar(80) default NULL,
- `dev_label` varchar(20) default NULL,
- `dev_type` char(1) default NULL,
- `dev_modelref` varchar(30) default NULL,
- `dev_protocol` varchar(15) default NULL,
- `dev_emitpower` float default NULL,
- `dev_antenna_gain` float default NULL,
- `dev_antenna_polarization` char(1) default NULL,
- `dev_antenna_direction` char(1) default NULL,
- PRIMARY KEY (`dev_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
-
---
--- Dumping data for table `devices`
---
-
-INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
-(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `floors`
---
-
-CREATE TABLE IF NOT EXISTS `floors` (
- `floor_id` int(11) NOT NULL auto_increment,
- `floor_name` varchar(45) NOT NULL default '',
- `building_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`floor_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
-
---
--- Dumping data for table `floors`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `histo`
---
-
-CREATE TABLE IF NOT EXISTS `histo` (
- `hst_id` int(10) unsigned NOT NULL auto_increment,
- `device_id` int(10) unsigned NOT NULL default '0',
- `map_id` int(10) unsigned NOT NULL default '0',
- `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `hst_xpos` int(10) unsigned default NULL,
- `hst_ypos` int(10) unsigned default NULL,
- PRIMARY KEY (`hst_id`),
- KEY `HISTO_FKIndex1` (`map_id`),
- KEY `HISTO_FKIndex2` (`device_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
-
---
--- Dumping data for table `histo`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `loc`
---
-
-CREATE TABLE IF NOT EXISTS `loc` (
- `ap_id` int(11) NOT NULL default '0',
- `loc_x` int(11) NOT NULL default '0',
- `loc_y` int(11) NOT NULL default '0',
- `loc_power` double NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `loc`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `maps`
---
-
-CREATE TABLE IF NOT EXISTS `maps` (
- `map_id` int(10) unsigned NOT NULL auto_increment,
- `map_version` int(11) NOT NULL default '0',
- `map_scale` double NOT NULL default '0',
- `building_id` int(11) NOT NULL default '0',
- `map_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`map_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
-
---
--- Dumping data for table `maps`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `serverconfig`
---
-
-CREATE TABLE IF NOT EXISTS `serverconfig` (
- `srv_key` varchar(79) NOT NULL default '',
- `srv_max_blocks` int(11) NOT NULL default '0',
- `srv_max_size_block` int(11) NOT NULL default '0',
- `srv_max_files` int(11) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `serverconfig`
---
-
-INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
-('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `users`
---
-
-CREATE TABLE IF NOT EXISTS `users` (
- `usr_id` int(10) unsigned NOT NULL auto_increment,
- `usr_login` varchar(20) default NULL,
- `usr_password` varchar(80) default NULL,
- `usr_description` varchar(200) default NULL,
- PRIMARY KEY (`usr_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `users`
---
-
-INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
-(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
Copied: trunk/witrack_create_db.sql (from rev 38, trunk/Server/witrack_create_db.sql)
===================================================================
--- trunk/witrack_create_db.sql (rev 0)
+++ trunk/witrack_create_db.sql 2008-06-17 02:46:45 UTC (rev 39)
@@ -0,0 +1,228 @@
+-- phpMyAdmin SQL Dump
+-- version 2.11.4
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Jun 07, 2008 at 04:32 PM
+-- Server version: 5.0.51
+-- PHP Version: 5.2.5
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Database: `witrack`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ap`
+--
+
+CREATE TABLE IF NOT EXISTS `ap` (
+ `ap_id` int(10) unsigned NOT NULL auto_increment,
+ `ap_macaddr` varchar(17) default NULL,
+ `ap_modelref` varchar(30) default NULL,
+ `ap_label` varchar(20) default NULL,
+ `ap_protocol` varchar(15) default NULL,
+ `ap_ssid` varchar(30) default NULL,
+ `ap_ipaddress` varchar(25) default NULL,
+ `ap_x` double NOT NULL default '0',
+ `ap_y` double NOT NULL default '0',
+ `map_id` int(11) NOT NULL default '0',
+ `ap_strength` double NOT NULL default '0',
+ `ap_description` text NOT NULL,
+ PRIMARY KEY (`ap_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
+
+--
+-- Dumping data for table `ap`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `areas`
+--
+
+CREATE TABLE IF NOT EXISTS `areas` (
+ `area_id` int(11) NOT NULL auto_increment,
+ `area_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`area_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `areas`
+--
+
+INSERT INTO `areas` (`area_id`, `area_name`) VALUES
+(1, 'School');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `buildings`
+--
+
+CREATE TABLE IF NOT EXISTS `buildings` (
+ `building_id` int(11) NOT NULL auto_increment,
+ `building_name` varchar(45) NOT NULL default '',
+ `area_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`building_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `buildings`
+--
+
+INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
+(1, 'Building1', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `devices`
+--
+
+CREATE TABLE IF NOT EXISTS `devices` (
+ `dev_id` int(10) unsigned NOT NULL auto_increment,
+ `dev_macaddr` varchar(17) default NULL,
+ `dev_passkey` varchar(80) default NULL,
+ `dev_label` varchar(20) default NULL,
+ `dev_type` char(1) default NULL,
+ `dev_modelref` varchar(30) default NULL,
+ `dev_protocol` varchar(15) default NULL,
+ `dev_emitpower` float default NULL,
+ `dev_antenna_gain` float default NULL,
+ `dev_antenna_polarization` char(1) default NULL,
+ `dev_antenna_direction` char(1) default NULL,
+ PRIMARY KEY (`dev_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+
+--
+-- Dumping data for table `devices`
+--
+
+INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
+(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `floors`
+--
+
+CREATE TABLE IF NOT EXISTS `floors` (
+ `floor_id` int(11) NOT NULL auto_increment,
+ `floor_name` varchar(45) NOT NULL default '',
+ `building_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`floor_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `floors`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `histo`
+--
+
+CREATE TABLE IF NOT EXISTS `histo` (
+ `hst_id` int(10) unsigned NOT NULL auto_increment,
+ `device_id` int(10) unsigned NOT NULL default '0',
+ `map_id` int(10) unsigned NOT NULL default '0',
+ `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `hst_xpos` int(10) unsigned default NULL,
+ `hst_ypos` int(10) unsigned default NULL,
+ PRIMARY KEY (`hst_id`),
+ KEY `HISTO_FKIndex1` (`map_id`),
+ KEY `HISTO_FKIndex2` (`device_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
+
+--
+-- Dumping data for table `histo`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `loc`
+--
+
+CREATE TABLE IF NOT EXISTS `loc` (
+ `ap_id` int(11) NOT NULL default '0',
+ `loc_x` int(11) NOT NULL default '0',
+ `loc_y` int(11) NOT NULL default '0',
+ `loc_power` double NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `loc`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `maps`
+--
+
+CREATE TABLE IF NOT EXISTS `maps` (
+ `map_id` int(10) unsigned NOT NULL auto_increment,
+ `map_version` int(11) NOT NULL default '0',
+ `map_scale` double NOT NULL default '0',
+ `building_id` int(11) NOT NULL default '0',
+ `map_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`map_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
+
+--
+-- Dumping data for table `maps`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `serverconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `serverconfig` (
+ `srv_key` varchar(79) NOT NULL default '',
+ `srv_max_blocks` int(11) NOT NULL default '0',
+ `srv_max_size_block` int(11) NOT NULL default '0',
+ `srv_max_files` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `serverconfig`
+--
+
+INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
+('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE IF NOT EXISTS `users` (
+ `usr_id` int(10) unsigned NOT NULL auto_increment,
+ `usr_login` varchar(20) default NULL,
+ `usr_password` varchar(80) default NULL,
+ `usr_description` varchar(200) default NULL,
+ PRIMARY KEY (`usr_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `users`
+--
+
+INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
+(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:46:18
|
Revision: 38
http://witrack.svn.sourceforge.net/witrack/?rev=38&view=rev
Author: thibnes
Date: 2008-06-16 19:46:15 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/Server/witrack_create_db.sql
Added: trunk/Server/witrack_create_db.sql
===================================================================
--- trunk/Server/witrack_create_db.sql (rev 0)
+++ trunk/Server/witrack_create_db.sql 2008-06-17 02:46:15 UTC (rev 38)
@@ -0,0 +1,228 @@
+-- phpMyAdmin SQL Dump
+-- version 2.11.4
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Jun 07, 2008 at 04:32 PM
+-- Server version: 5.0.51
+-- PHP Version: 5.2.5
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Database: `witrack`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ap`
+--
+
+CREATE TABLE IF NOT EXISTS `ap` (
+ `ap_id` int(10) unsigned NOT NULL auto_increment,
+ `ap_macaddr` varchar(17) default NULL,
+ `ap_modelref` varchar(30) default NULL,
+ `ap_label` varchar(20) default NULL,
+ `ap_protocol` varchar(15) default NULL,
+ `ap_ssid` varchar(30) default NULL,
+ `ap_ipaddress` varchar(25) default NULL,
+ `ap_x` double NOT NULL default '0',
+ `ap_y` double NOT NULL default '0',
+ `map_id` int(11) NOT NULL default '0',
+ `ap_strength` double NOT NULL default '0',
+ `ap_description` text NOT NULL,
+ PRIMARY KEY (`ap_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
+
+--
+-- Dumping data for table `ap`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `areas`
+--
+
+CREATE TABLE IF NOT EXISTS `areas` (
+ `area_id` int(11) NOT NULL auto_increment,
+ `area_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`area_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `areas`
+--
+
+INSERT INTO `areas` (`area_id`, `area_name`) VALUES
+(1, 'School');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `buildings`
+--
+
+CREATE TABLE IF NOT EXISTS `buildings` (
+ `building_id` int(11) NOT NULL auto_increment,
+ `building_name` varchar(45) NOT NULL default '',
+ `area_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`building_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `buildings`
+--
+
+INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
+(1, 'Building1', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `devices`
+--
+
+CREATE TABLE IF NOT EXISTS `devices` (
+ `dev_id` int(10) unsigned NOT NULL auto_increment,
+ `dev_macaddr` varchar(17) default NULL,
+ `dev_passkey` varchar(80) default NULL,
+ `dev_label` varchar(20) default NULL,
+ `dev_type` char(1) default NULL,
+ `dev_modelref` varchar(30) default NULL,
+ `dev_protocol` varchar(15) default NULL,
+ `dev_emitpower` float default NULL,
+ `dev_antenna_gain` float default NULL,
+ `dev_antenna_polarization` char(1) default NULL,
+ `dev_antenna_direction` char(1) default NULL,
+ PRIMARY KEY (`dev_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+
+--
+-- Dumping data for table `devices`
+--
+
+INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
+(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `floors`
+--
+
+CREATE TABLE IF NOT EXISTS `floors` (
+ `floor_id` int(11) NOT NULL auto_increment,
+ `floor_name` varchar(45) NOT NULL default '',
+ `building_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`floor_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `floors`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `histo`
+--
+
+CREATE TABLE IF NOT EXISTS `histo` (
+ `hst_id` int(10) unsigned NOT NULL auto_increment,
+ `device_id` int(10) unsigned NOT NULL default '0',
+ `map_id` int(10) unsigned NOT NULL default '0',
+ `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `hst_xpos` int(10) unsigned default NULL,
+ `hst_ypos` int(10) unsigned default NULL,
+ PRIMARY KEY (`hst_id`),
+ KEY `HISTO_FKIndex1` (`map_id`),
+ KEY `HISTO_FKIndex2` (`device_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
+
+--
+-- Dumping data for table `histo`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `loc`
+--
+
+CREATE TABLE IF NOT EXISTS `loc` (
+ `ap_id` int(11) NOT NULL default '0',
+ `loc_x` int(11) NOT NULL default '0',
+ `loc_y` int(11) NOT NULL default '0',
+ `loc_power` double NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `loc`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `maps`
+--
+
+CREATE TABLE IF NOT EXISTS `maps` (
+ `map_id` int(10) unsigned NOT NULL auto_increment,
+ `map_version` int(11) NOT NULL default '0',
+ `map_scale` double NOT NULL default '0',
+ `building_id` int(11) NOT NULL default '0',
+ `map_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`map_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
+
+--
+-- Dumping data for table `maps`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `serverconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `serverconfig` (
+ `srv_key` varchar(79) NOT NULL default '',
+ `srv_max_blocks` int(11) NOT NULL default '0',
+ `srv_max_size_block` int(11) NOT NULL default '0',
+ `srv_max_files` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `serverconfig`
+--
+
+INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
+('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE IF NOT EXISTS `users` (
+ `usr_id` int(10) unsigned NOT NULL auto_increment,
+ `usr_login` varchar(20) default NULL,
+ `usr_password` varchar(80) default NULL,
+ `usr_description` varchar(200) default NULL,
+ PRIMARY KEY (`usr_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `users`
+--
+
+INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
+(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:45:45
|
Revision: 37
http://witrack.svn.sourceforge.net/witrack/?rev=37&view=rev
Author: thibnes
Date: 2008-06-16 19:45:43 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:44:26
|
Revision: 36
http://witrack.svn.sourceforge.net/witrack/?rev=36&view=rev
Author: thibnes
Date: 2008-06-16 19:44:24 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Removed Paths:
-------------
trunk/witrack_create_db.sql
Deleted: trunk/witrack_create_db.sql
===================================================================
--- trunk/witrack_create_db.sql 2008-06-17 02:17:35 UTC (rev 35)
+++ trunk/witrack_create_db.sql 2008-06-17 02:44:24 UTC (rev 36)
@@ -1,229 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 2.11.4
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Jun 07, 2008 at 04:32 PM
--- Server version: 5.0.51
--- PHP Version: 5.2.5
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
---
--- Database: `witrack`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ap`
---
-
-CREATE TABLE IF NOT EXISTS `ap` (
- `ap_id` int(10) unsigned NOT NULL auto_increment,
- `ap_macaddr` varchar(17) default NULL,
- `ap_modelref` varchar(30) default NULL,
- `ap_label` varchar(20) default NULL,
- `ap_protocol` varchar(15) default NULL,
- `ap_ssid` varchar(30) default NULL,
- `ap_ipaddress` varchar(25) default NULL,
- `ap_x` double NOT NULL default '0',
- `ap_y` double NOT NULL default '0',
- `map_id` int(11) NOT NULL default '0',
- `ap_strength` double NOT NULL default '0',
- `ap_description` text NOT NULL,
- PRIMARY KEY (`ap_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
-
---
--- Dumping data for table `ap`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `areas`
---
-
-CREATE TABLE IF NOT EXISTS `areas` (
- `area_id` int(11) NOT NULL auto_increment,
- `area_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`area_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `areas`
---
-
-INSERT INTO `areas` (`area_id`, `area_name`) VALUES
-(1, 'School');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `buildings`
---
-
-CREATE TABLE IF NOT EXISTS `buildings` (
- `building_id` int(11) NOT NULL auto_increment,
- `building_name` varchar(45) NOT NULL default '',
- `area_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`building_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `buildings`
---
-
-INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
-(1, 'Building1', 1);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `devices`
---
-
-CREATE TABLE IF NOT EXISTS `devices` (
- `dev_id` int(10) unsigned NOT NULL auto_increment,
- `dev_macaddr` varchar(17) default NULL,
- `dev_passkey` varchar(80) default NULL,
- `dev_label` varchar(20) default NULL,
- `dev_type` char(1) default NULL,
- `dev_modelref` varchar(30) default NULL,
- `dev_protocol` varchar(15) default NULL,
- `dev_emitpower` float default NULL,
- `dev_antenna_gain` float default NULL,
- `dev_antenna_polarization` char(1) default NULL,
- `dev_antenna_direction` char(1) default NULL,
- PRIMARY KEY (`dev_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
-
---
--- Dumping data for table `devices`
---
-
-INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
-(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V'),
-(2, '00:0C:41:FB:85:A0', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Linksys', 'N', 'WRT54GS', '802', 42, 51, 'P', 'V');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `floors`
---
-
-CREATE TABLE IF NOT EXISTS `floors` (
- `floor_id` int(11) NOT NULL auto_increment,
- `floor_name` varchar(45) NOT NULL default '',
- `building_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`floor_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
-
---
--- Dumping data for table `floors`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `histo`
---
-
-CREATE TABLE IF NOT EXISTS `histo` (
- `hst_id` int(10) unsigned NOT NULL auto_increment,
- `device_id` int(10) unsigned NOT NULL default '0',
- `map_id` int(10) unsigned NOT NULL default '0',
- `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `hst_xpos` int(10) unsigned default NULL,
- `hst_ypos` int(10) unsigned default NULL,
- PRIMARY KEY (`hst_id`),
- KEY `HISTO_FKIndex1` (`map_id`),
- KEY `HISTO_FKIndex2` (`device_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
-
---
--- Dumping data for table `histo`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `loc`
---
-
-CREATE TABLE IF NOT EXISTS `loc` (
- `ap_id` int(11) NOT NULL default '0',
- `loc_x` int(11) NOT NULL default '0',
- `loc_y` int(11) NOT NULL default '0',
- `loc_power` double NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `loc`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `maps`
---
-
-CREATE TABLE IF NOT EXISTS `maps` (
- `map_id` int(10) unsigned NOT NULL auto_increment,
- `map_version` int(11) NOT NULL default '0',
- `map_scale` double NOT NULL default '0',
- `building_id` int(11) NOT NULL default '0',
- `map_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`map_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
-
---
--- Dumping data for table `maps`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `serverconfig`
---
-
-CREATE TABLE IF NOT EXISTS `serverconfig` (
- `srv_key` varchar(79) NOT NULL default '',
- `srv_max_blocks` int(11) NOT NULL default '0',
- `srv_max_size_block` int(11) NOT NULL default '0',
- `srv_max_files` int(11) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `serverconfig`
---
-
-INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
-('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `users`
---
-
-CREATE TABLE IF NOT EXISTS `users` (
- `usr_id` int(10) unsigned NOT NULL auto_increment,
- `usr_login` varchar(20) default NULL,
- `usr_password` varchar(80) default NULL,
- `usr_description` varchar(200) default NULL,
- PRIMARY KEY (`usr_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `users`
---
-
-INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
-(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:17:39
|
Revision: 35
http://witrack.svn.sourceforge.net/witrack/?rev=35&view=rev
Author: thibnes
Date: 2008-06-16 19:17:35 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/witrack_create_db.sql
Removed Paths:
-------------
trunk/Server/witrack_create_db.sql
Deleted: trunk/Server/witrack_create_db.sql
===================================================================
--- trunk/Server/witrack_create_db.sql 2008-06-17 02:16:33 UTC (rev 34)
+++ trunk/Server/witrack_create_db.sql 2008-06-17 02:17:35 UTC (rev 35)
@@ -1,229 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 2.11.4
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Jun 07, 2008 at 04:32 PM
--- Server version: 5.0.51
--- PHP Version: 5.2.5
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
---
--- Database: `witrack`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ap`
---
-
-CREATE TABLE IF NOT EXISTS `ap` (
- `ap_id` int(10) unsigned NOT NULL auto_increment,
- `ap_macaddr` varchar(17) default NULL,
- `ap_modelref` varchar(30) default NULL,
- `ap_label` varchar(20) default NULL,
- `ap_protocol` varchar(15) default NULL,
- `ap_ssid` varchar(30) default NULL,
- `ap_ipaddress` varchar(25) default NULL,
- `ap_x` double NOT NULL default '0',
- `ap_y` double NOT NULL default '0',
- `map_id` int(11) NOT NULL default '0',
- `ap_strength` double NOT NULL default '0',
- `ap_description` text NOT NULL,
- PRIMARY KEY (`ap_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
-
---
--- Dumping data for table `ap`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `areas`
---
-
-CREATE TABLE IF NOT EXISTS `areas` (
- `area_id` int(11) NOT NULL auto_increment,
- `area_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`area_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `areas`
---
-
-INSERT INTO `areas` (`area_id`, `area_name`) VALUES
-(1, 'School');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `buildings`
---
-
-CREATE TABLE IF NOT EXISTS `buildings` (
- `building_id` int(11) NOT NULL auto_increment,
- `building_name` varchar(45) NOT NULL default '',
- `area_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`building_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
-
---
--- Dumping data for table `buildings`
---
-
-INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
-(1, 'Building1', 1);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `devices`
---
-
-CREATE TABLE IF NOT EXISTS `devices` (
- `dev_id` int(10) unsigned NOT NULL auto_increment,
- `dev_macaddr` varchar(17) default NULL,
- `dev_passkey` varchar(80) default NULL,
- `dev_label` varchar(20) default NULL,
- `dev_type` char(1) default NULL,
- `dev_modelref` varchar(30) default NULL,
- `dev_protocol` varchar(15) default NULL,
- `dev_emitpower` float default NULL,
- `dev_antenna_gain` float default NULL,
- `dev_antenna_polarization` char(1) default NULL,
- `dev_antenna_direction` char(1) default NULL,
- PRIMARY KEY (`dev_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
-
---
--- Dumping data for table `devices`
---
-
-INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
-(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V'),
-(2, '00:0C:41:FB:85:A0', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Linksys', 'N', 'WRT54GS', '802', 42, 51, 'P', 'V');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `floors`
---
-
-CREATE TABLE IF NOT EXISTS `floors` (
- `floor_id` int(11) NOT NULL auto_increment,
- `floor_name` varchar(45) NOT NULL default '',
- `building_id` int(11) NOT NULL default '0',
- PRIMARY KEY (`floor_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
-
---
--- Dumping data for table `floors`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `histo`
---
-
-CREATE TABLE IF NOT EXISTS `histo` (
- `hst_id` int(10) unsigned NOT NULL auto_increment,
- `device_id` int(10) unsigned NOT NULL default '0',
- `map_id` int(10) unsigned NOT NULL default '0',
- `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `hst_xpos` int(10) unsigned default NULL,
- `hst_ypos` int(10) unsigned default NULL,
- PRIMARY KEY (`hst_id`),
- KEY `HISTO_FKIndex1` (`map_id`),
- KEY `HISTO_FKIndex2` (`device_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
-
---
--- Dumping data for table `histo`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `loc`
---
-
-CREATE TABLE IF NOT EXISTS `loc` (
- `ap_id` int(11) NOT NULL default '0',
- `loc_x` int(11) NOT NULL default '0',
- `loc_y` int(11) NOT NULL default '0',
- `loc_power` double NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `loc`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `maps`
---
-
-CREATE TABLE IF NOT EXISTS `maps` (
- `map_id` int(10) unsigned NOT NULL auto_increment,
- `map_version` int(11) NOT NULL default '0',
- `map_scale` double NOT NULL default '0',
- `building_id` int(11) NOT NULL default '0',
- `map_name` varchar(45) NOT NULL default '',
- PRIMARY KEY (`map_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
-
---
--- Dumping data for table `maps`
---
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `serverconfig`
---
-
-CREATE TABLE IF NOT EXISTS `serverconfig` (
- `srv_key` varchar(79) NOT NULL default '',
- `srv_max_blocks` int(11) NOT NULL default '0',
- `srv_max_size_block` int(11) NOT NULL default '0',
- `srv_max_files` int(11) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `serverconfig`
---
-
-INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
-('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `users`
---
-
-CREATE TABLE IF NOT EXISTS `users` (
- `usr_id` int(10) unsigned NOT NULL auto_increment,
- `usr_login` varchar(20) default NULL,
- `usr_password` varchar(80) default NULL,
- `usr_description` varchar(200) default NULL,
- PRIMARY KEY (`usr_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `users`
---
-
-INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
-(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
Copied: trunk/witrack_create_db.sql (from rev 34, trunk/Server/witrack_create_db.sql)
===================================================================
--- trunk/witrack_create_db.sql (rev 0)
+++ trunk/witrack_create_db.sql 2008-06-17 02:17:35 UTC (rev 35)
@@ -0,0 +1,229 @@
+-- phpMyAdmin SQL Dump
+-- version 2.11.4
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Jun 07, 2008 at 04:32 PM
+-- Server version: 5.0.51
+-- PHP Version: 5.2.5
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Database: `witrack`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ap`
+--
+
+CREATE TABLE IF NOT EXISTS `ap` (
+ `ap_id` int(10) unsigned NOT NULL auto_increment,
+ `ap_macaddr` varchar(17) default NULL,
+ `ap_modelref` varchar(30) default NULL,
+ `ap_label` varchar(20) default NULL,
+ `ap_protocol` varchar(15) default NULL,
+ `ap_ssid` varchar(30) default NULL,
+ `ap_ipaddress` varchar(25) default NULL,
+ `ap_x` double NOT NULL default '0',
+ `ap_y` double NOT NULL default '0',
+ `map_id` int(11) NOT NULL default '0',
+ `ap_strength` double NOT NULL default '0',
+ `ap_description` text NOT NULL,
+ PRIMARY KEY (`ap_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
+
+--
+-- Dumping data for table `ap`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `areas`
+--
+
+CREATE TABLE IF NOT EXISTS `areas` (
+ `area_id` int(11) NOT NULL auto_increment,
+ `area_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`area_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `areas`
+--
+
+INSERT INTO `areas` (`area_id`, `area_name`) VALUES
+(1, 'School');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `buildings`
+--
+
+CREATE TABLE IF NOT EXISTS `buildings` (
+ `building_id` int(11) NOT NULL auto_increment,
+ `building_name` varchar(45) NOT NULL default '',
+ `area_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`building_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `buildings`
+--
+
+INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
+(1, 'Building1', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `devices`
+--
+
+CREATE TABLE IF NOT EXISTS `devices` (
+ `dev_id` int(10) unsigned NOT NULL auto_increment,
+ `dev_macaddr` varchar(17) default NULL,
+ `dev_passkey` varchar(80) default NULL,
+ `dev_label` varchar(20) default NULL,
+ `dev_type` char(1) default NULL,
+ `dev_modelref` varchar(30) default NULL,
+ `dev_protocol` varchar(15) default NULL,
+ `dev_emitpower` float default NULL,
+ `dev_antenna_gain` float default NULL,
+ `dev_antenna_polarization` char(1) default NULL,
+ `dev_antenna_direction` char(1) default NULL,
+ PRIMARY KEY (`dev_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+
+--
+-- Dumping data for table `devices`
+--
+
+INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
+(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V'),
+(2, '00:0C:41:FB:85:A0', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Linksys', 'N', 'WRT54GS', '802', 42, 51, 'P', 'V');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `floors`
+--
+
+CREATE TABLE IF NOT EXISTS `floors` (
+ `floor_id` int(11) NOT NULL auto_increment,
+ `floor_name` varchar(45) NOT NULL default '',
+ `building_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`floor_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `floors`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `histo`
+--
+
+CREATE TABLE IF NOT EXISTS `histo` (
+ `hst_id` int(10) unsigned NOT NULL auto_increment,
+ `device_id` int(10) unsigned NOT NULL default '0',
+ `map_id` int(10) unsigned NOT NULL default '0',
+ `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `hst_xpos` int(10) unsigned default NULL,
+ `hst_ypos` int(10) unsigned default NULL,
+ PRIMARY KEY (`hst_id`),
+ KEY `HISTO_FKIndex1` (`map_id`),
+ KEY `HISTO_FKIndex2` (`device_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
+
+--
+-- Dumping data for table `histo`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `loc`
+--
+
+CREATE TABLE IF NOT EXISTS `loc` (
+ `ap_id` int(11) NOT NULL default '0',
+ `loc_x` int(11) NOT NULL default '0',
+ `loc_y` int(11) NOT NULL default '0',
+ `loc_power` double NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `loc`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `maps`
+--
+
+CREATE TABLE IF NOT EXISTS `maps` (
+ `map_id` int(10) unsigned NOT NULL auto_increment,
+ `map_version` int(11) NOT NULL default '0',
+ `map_scale` double NOT NULL default '0',
+ `building_id` int(11) NOT NULL default '0',
+ `map_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`map_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
+
+--
+-- Dumping data for table `maps`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `serverconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `serverconfig` (
+ `srv_key` varchar(79) NOT NULL default '',
+ `srv_max_blocks` int(11) NOT NULL default '0',
+ `srv_max_size_block` int(11) NOT NULL default '0',
+ `srv_max_files` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `serverconfig`
+--
+
+INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
+('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE IF NOT EXISTS `users` (
+ `usr_id` int(10) unsigned NOT NULL auto_increment,
+ `usr_login` varchar(20) default NULL,
+ `usr_password` varchar(80) default NULL,
+ `usr_description` varchar(200) default NULL,
+ PRIMARY KEY (`usr_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `users`
+--
+
+INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
+(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-17 02:16:38
|
Revision: 34
http://witrack.svn.sourceforge.net/witrack/?rev=34&view=rev
Author: thibnes
Date: 2008-06-16 19:16:33 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/Server/witrack_create_db.sql
Added: trunk/Server/witrack_create_db.sql
===================================================================
--- trunk/Server/witrack_create_db.sql (rev 0)
+++ trunk/Server/witrack_create_db.sql 2008-06-17 02:16:33 UTC (rev 34)
@@ -0,0 +1,229 @@
+-- phpMyAdmin SQL Dump
+-- version 2.11.4
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Jun 07, 2008 at 04:32 PM
+-- Server version: 5.0.51
+-- PHP Version: 5.2.5
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Database: `witrack`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ap`
+--
+
+CREATE TABLE IF NOT EXISTS `ap` (
+ `ap_id` int(10) unsigned NOT NULL auto_increment,
+ `ap_macaddr` varchar(17) default NULL,
+ `ap_modelref` varchar(30) default NULL,
+ `ap_label` varchar(20) default NULL,
+ `ap_protocol` varchar(15) default NULL,
+ `ap_ssid` varchar(30) default NULL,
+ `ap_ipaddress` varchar(25) default NULL,
+ `ap_x` double NOT NULL default '0',
+ `ap_y` double NOT NULL default '0',
+ `map_id` int(11) NOT NULL default '0',
+ `ap_strength` double NOT NULL default '0',
+ `ap_description` text NOT NULL,
+ PRIMARY KEY (`ap_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=26 ;
+
+--
+-- Dumping data for table `ap`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `areas`
+--
+
+CREATE TABLE IF NOT EXISTS `areas` (
+ `area_id` int(11) NOT NULL auto_increment,
+ `area_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`area_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `areas`
+--
+
+INSERT INTO `areas` (`area_id`, `area_name`) VALUES
+(1, 'School');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `buildings`
+--
+
+CREATE TABLE IF NOT EXISTS `buildings` (
+ `building_id` int(11) NOT NULL auto_increment,
+ `building_name` varchar(45) NOT NULL default '',
+ `area_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`building_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=7 ;
+
+--
+-- Dumping data for table `buildings`
+--
+
+INSERT INTO `buildings` (`building_id`, `building_name`, `area_id`) VALUES
+(1, 'Building1', 1);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `devices`
+--
+
+CREATE TABLE IF NOT EXISTS `devices` (
+ `dev_id` int(10) unsigned NOT NULL auto_increment,
+ `dev_macaddr` varchar(17) default NULL,
+ `dev_passkey` varchar(80) default NULL,
+ `dev_label` varchar(20) default NULL,
+ `dev_type` char(1) default NULL,
+ `dev_modelref` varchar(30) default NULL,
+ `dev_protocol` varchar(15) default NULL,
+ `dev_emitpower` float default NULL,
+ `dev_antenna_gain` float default NULL,
+ `dev_antenna_polarization` char(1) default NULL,
+ `dev_antenna_direction` char(1) default NULL,
+ PRIMARY KEY (`dev_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+
+--
+-- Dumping data for table `devices`
+--
+
+INSERT INTO `devices` (`dev_id`, `dev_macaddr`, `dev_passkey`, `dev_label`, `dev_type`, `dev_modelref`, `dev_protocol`, `dev_emitpower`, `dev_antenna_gain`, `dev_antenna_polarization`, `dev_antenna_direction`) VALUES
+(1, 'FF:FF:FF:FF:FF:FF', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Hawyire', 'N', 'Laptop Core Duo', '802.11g', 42.5, 12.2, 'P', 'V'),
+(2, '00:0C:41:FB:85:A0', '-128:108:15:62:12:-89:45:-56:100:-63:74:99:-47:20:-30:-105', 'Linksys', 'N', 'WRT54GS', '802', 42, 51, 'P', 'V');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `floors`
+--
+
+CREATE TABLE IF NOT EXISTS `floors` (
+ `floor_id` int(11) NOT NULL auto_increment,
+ `floor_name` varchar(45) NOT NULL default '',
+ `building_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`floor_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `floors`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `histo`
+--
+
+CREATE TABLE IF NOT EXISTS `histo` (
+ `hst_id` int(10) unsigned NOT NULL auto_increment,
+ `device_id` int(10) unsigned NOT NULL default '0',
+ `map_id` int(10) unsigned NOT NULL default '0',
+ `hst_timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+ `hst_xpos` int(10) unsigned default NULL,
+ `hst_ypos` int(10) unsigned default NULL,
+ PRIMARY KEY (`hst_id`),
+ KEY `HISTO_FKIndex1` (`map_id`),
+ KEY `HISTO_FKIndex2` (`device_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
+
+--
+-- Dumping data for table `histo`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `loc`
+--
+
+CREATE TABLE IF NOT EXISTS `loc` (
+ `ap_id` int(11) NOT NULL default '0',
+ `loc_x` int(11) NOT NULL default '0',
+ `loc_y` int(11) NOT NULL default '0',
+ `loc_power` double NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `loc`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `maps`
+--
+
+CREATE TABLE IF NOT EXISTS `maps` (
+ `map_id` int(10) unsigned NOT NULL auto_increment,
+ `map_version` int(11) NOT NULL default '0',
+ `map_scale` double NOT NULL default '0',
+ `building_id` int(11) NOT NULL default '0',
+ `map_name` varchar(45) NOT NULL default '',
+ PRIMARY KEY (`map_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=19 ;
+
+--
+-- Dumping data for table `maps`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `serverconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `serverconfig` (
+ `srv_key` varchar(79) NOT NULL default '',
+ `srv_max_blocks` int(11) NOT NULL default '0',
+ `srv_max_size_block` int(11) NOT NULL default '0',
+ `srv_max_files` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `serverconfig`
+--
+
+INSERT INTO `serverconfig` (`srv_key`, `srv_max_blocks`, `srv_max_size_block`, `srv_max_files`) VALUES
+('-107:-104:78:87:-117:91:55:111:-27:65:96:-23:63:-100:-87:61', 10, 500000, 10);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE IF NOT EXISTS `users` (
+ `usr_id` int(10) unsigned NOT NULL auto_increment,
+ `usr_login` varchar(20) default NULL,
+ `usr_password` varchar(80) default NULL,
+ `usr_description` varchar(200) default NULL,
+ PRIMARY KEY (`usr_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `users`
+--
+
+INSERT INTO `users` (`usr_id`, `usr_login`, `usr_password`, `usr_description`) VALUES
+(1, 'user1', '-40:-84:-10:8:-60:119:-85:119:-87:-46:-37:55:-37:-119:-29:123', 'Test Account');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-07 05:39:33
|
Revision: 33
http://witrack.svn.sourceforge.net/witrack/?rev=33&view=rev
Author: thibnes
Date: 2008-06-06 22:39:32 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/Server/net/witrack/server/ViewerWorker.java
Modified: trunk/Server/net/witrack/server/ViewerWorker.java
===================================================================
--- trunk/Server/net/witrack/server/ViewerWorker.java 2008-06-07 02:05:35 UTC (rev 32)
+++ trunk/Server/net/witrack/server/ViewerWorker.java 2008-06-07 05:39:32 UTC (rev 33)
@@ -806,10 +806,17 @@
balise.addContent("false");
racine.addContent(balise);
+ /*
File tmpDirectory = new File("maps");
if (tmpDirectory.exists() == false)
throw new CoreWitrackException(_error.getStringError("MAPS_DIR_NOT_FOUND"), "MAPS_DIR_NOT_FOUND");
+ */
+ File tmpDirectory = new File("maps");
+ if (tmpDirectory.exists() == false)
+ if (tmpDirectory.mkdirs() == false)
+ throw new CoreWitrackException(_error.getStringError("MAPS_DIR_NOT_FOUND"), "MAPS_DIR_NOT_FOUND");
+
XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
xmlOut.output(document, new FileOutputStream("maps/map_" + idString + "_desc.xml"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-07 02:05:37
|
Revision: 32
http://witrack.svn.sourceforge.net/witrack/?rev=32&view=rev
Author: thibnes
Date: 2008-06-06 19:05:35 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/Server/config.ini
Modified: trunk/Server/config.ini
===================================================================
--- trunk/Server/config.ini 2008-06-06 10:20:54 UTC (rev 31)
+++ trunk/Server/config.ini 2008-06-07 02:05:35 UTC (rev 32)
@@ -1,7 +1,7 @@
DBtype = mysql
DBbase = witrack
DBuser = witrackserver
-DBpassword = toto
+DBpassword = wipass
DBlocation = localhost
ViewerPort = 9001
DevicePort = 9002
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <th...@us...> - 2008-06-06 10:20:57
|
Revision: 31
http://witrack.svn.sourceforge.net/witrack/?rev=31&view=rev
Author: thibnes
Date: 2008-06-06 03:20:54 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
server classpath edition to directly use the network lib (the one generated from the "Jars" project)
Modified Paths:
--------------
trunk/Server/.classpath
Modified: trunk/Server/.classpath
===================================================================
--- trunk/Server/.classpath 2008-03-13 04:19:37 UTC (rev 30)
+++ trunk/Server/.classpath 2008-06-06 10:20:54 UTC (rev 31)
@@ -8,6 +8,6 @@
<classpathentry exported="true" kind="lib" path="jars/saxpath.jar"/>
<classpathentry exported="true" kind="lib" path="jars/xerces_2_5_0.jar"/>
<classpathentry exported="true" kind="lib" path="jars/xerces.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/Jars"/>
+ <classpathentry kind="lib" path="/net.witrack.manager/lib/lib-witrack.jar"/>
<classpathentry kind="output" path=""/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
