db updates and api hacking

* rule_mappings needed id and active flag
* perl api needs to much context, hacking together something to
  try and test
* test db will be moved to another location

server/scripts/RideLogic.pm

@@ -70,11 +70,17 @@ our @ISA = qw(Exporter);
 
 our $VERSION="0.1";
 
-our $RIDELOGIC_DAEMON_CONF="/etc/ridelogic/daemon.conf";
-our $RIDELOGIC_DAEMON_LOG_DIR="/var/log/ridelogic";
-our $RIDELOGIC_DAEMON_PID_DIR="/var/run/ridelogic";
+#our $RIDELOGIC_DAEMON_CONF="/etc/ridelogic/daemon.conf";
+#our $RIDELOGIC_DAEMON_LOG_DIR="/var/log/ridelogic";
+#our $RIDELOGIC_DAEMON_PID_DIR="/var/run/ridelogic";
+#
+#our $RIDELOGIC_API_CONF="/etc/ridelogic/api.conf";
+
+our $RIDELOGIC_DAEMON_CONF="daemon.conf";
+our $RIDELOGIC_DAEMON_LOG_DIR="./";
+our $RIDELOGIC_DAEMON_PID_DIR="./";
 
-our $RIDELOGIC_API_CONF="/etc/ridelogic/api.conf";
+our $RIDELOGIC_API_CONF="api.conf";
 
 sub audit_user_pass_start {
   my $dbh = shift;

server/sql_schema/create_tables.sql

@@ -463,10 +463,12 @@ CREATE TABLE `admin_groups` (
 
 DROP TABLE IF EXISTS `rule_mappings`;
 CREATE TABLE `rule_mappings` (
+  `id` int not null,
           `rule` char(255) NOT NULL default '',
           `rule_text` char(255) default NULL,
           `group_id` int(11) default NULL,
-          PRIMARY KEY  (`rule`)
+          `active` int,
+          PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 DROP TABLE IF EXISTS `org_default_pass_value`;

server/sql_schema/create_tables.sqlite

@@ -51,14 +51,12 @@ CREATE TABLE IF NOT EXISTS active_rider_table (
 
   -- The rest are for server-side recordkeeping...
 
-  deleted BOOLEAN DEFAULT '0',
-  parent_entity VARCHAR(32),
-  notes  VARCHAR(64)
-
+  deleted BOOLEAN DEFAULT '0'
 ) ;
 
-create INDEX id_idx on active_rider_table (logical_card_id);
-create INDEX id_and_seq on active_rider_table (logical_card_id, seq_num);
+create INDEX active_rider_table_seq_idx on active_rider_table (seq_num);
+create INDEX active_rider_table_card_idx on active_rider_table (logical_card_id);
+create INDEX active_rider_table_card_seq_and_card on active_rider_table (logical_card_id, seq_num);
 
 
 -- Billing Log Table
@@ -460,7 +458,8 @@ CREATE TABLE `rule_mappings` (
   id INTEGER PRIMARY KEY,
           `rule` char(255) NOT NULL default '',
           `rule_text` char(255) default NULL,
-          `group_id` INTEGER default NULL
+          `group_id` INTEGER default NULL,
+          `active` INTEGER
 ) ;
 
 DROP TABLE IF EXISTS `org_default_pass_value`;

server/sql_schema/testing/setup_testdb.sqlite

@@ -1,84 +0,0 @@
-insert into drivers (id, pin, name) values (7357, 7357, 'Test driver');
-
-insert into groups
-  (group_id, group_name)
-  values
-  (73576, 'ORG');
-
-insert into org_default_card_value
-  (group_id, mag_track, rf_length, rf_site)
-  values
-  (73576, 2, 26, 137);
-
-insert into rule_class
-  (rulename, ruleclass)
-  values
-  ('ORG-NRIDE', 'NRIDE'),
-  ('ORG-NDAY', 'NDAY'),
-  ('ORG-TESTING', 'OTHER');
-
-insert into rule_mappings
-  (rule, rule_text, group_id, active)
-  values
-  ('ORG-NRIDE', 'N-Ride Pass', 73576, 1),
-  ('ORG-NDAY', 'N-Day Pass', 73576, 1),
-  ('ORG-TESTING', 'Org Testing', 73576, 1);
-
-insert into user_card
-  (logical_card_id, mag_token, rfid_token, comment,
-   issued, active,
-   deactivated, lastused, firstused,
-   group_id, issuetype)
-  values
-  (1, '2:555', '35:507:555', 'testing card',
-   datetime(), 1,
-   NULL, NULL, NULL,
-   73576, NULL);
-
-insert into user_pass
-  (user_pass_id, logical_card_id,
-   issued, activated, deactivated,
-   firstused, lastused,
-   nrides_orig, nrides_remain,
-   nday_orig, nday_expiration,
-   active, expired,
-   rule, queue_order,
-   comment, paytype)
-
-  values
-
-  (11, 1,
-   datetime(), datetime(), NULL,
-   NULL, NULL,
-   5, 5,
-   NULL, NULL,
-   1, 0,
-   'RULE', 1,
-   'Test pass', NULL),
-  (12, 1,
-   datetime(), datetime(), NULL,
-   NULL, NULL,
-   NULL, NULL,
-   15, NULL,
-   1, 0,
-   'RULE', 1,
-   'Test pass', NULL),
-
-  (13, 2,
-   datetime(), datetime(), NULL,
-   NULL, NULL,
-   5, 5,
-   NULL, NULL,
-   1, 0,
-   'RULE', 1,
-   'Test pass', NULL),
-  (13, 2,
-   datetime(), datetime(), NULL,
-   NULL, NULL,
-   NULL, NULL,
-   15, NULL,
-   1, 0,
-   'RULE', 1,
-   'Test pass', NULL);
-   
-