From 07bd9e8e8797a0ee438e1026824ac253c168ff0e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 7 Mar 2012 23:04:39 +0000 Subject: Got the config file loading working for ormlite. --- gen/net/cbaines/suma/R.java | 15 +- res/raw/org.rdf | 6168 -------------------------- res/raw/ormlite_config.txt | 183 +- src/net/cbaines/suma/BusStop.java | 3 +- src/net/cbaines/suma/DatabaseConfigUtil.java | 5 +- src/net/cbaines/suma/DatabaseHelper.java | 37 +- src/net/cbaines/suma/POI.java | 82 +- 7 files changed, 248 insertions(+), 6245 deletions(-) delete mode 100644 res/raw/org.rdf diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index 01cabe8..7ff7855 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -148,14 +148,13 @@ public final class R { public static final int map_menu=0x7f090002; } public static final class raw { - public static final int org=0x7f060000; - public static final int ormlite_config=0x7f060001; - public static final int u1=0x7f060002; - public static final int u1e=0x7f060003; - public static final int u1n=0x7f060004; - public static final int u2=0x7f060005; - public static final int u6=0x7f060006; - public static final int u9=0x7f060007; + public static final int ormlite_config=0x7f060000; + public static final int u1=0x7f060001; + public static final int u1e=0x7f060002; + public static final int u1n=0x7f060003; + public static final int u2=0x7f060004; + public static final int u6=0x7f060005; + public static final int u9=0x7f060006; } public static final class string { public static final int U1=0x7f070009; diff --git a/res/raw/org.rdf b/res/raw/org.rdf deleted file mode 100644 index db580f9..0000000 --- a/res/raw/org.rdf +++ /dev/null @@ -1,6168 +0,0 @@ - - - - - - - - - - - - - - - - 2011-11-30T09:43:54Z - - - 2011-11-30T09:43:55Z - - - - - - - - - - - - - - - 2011-11-30T09:43:55Z - - - 2011-11-30T09:43:56Z - - - - - - - - - - - - - - - - - - 2011-11-30 - - - This list of organisations and organisational units is taken from the table used by the "MUD" directory, so may not be authoritative. The University organisation is currently changing so these identifiers should be treated with caution. - - - - - - - - - - - - Organisation - - - - - - - - - Generated by OpenOrg Grinder using the org.xsl transform by Christopher Gutteridge. See http://wiki.openorg.ecs.soton.ac.uk/wiki/OpenOrg_Grinder. Generated at 2011-11-30T09:43:56+00:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2011-11-30T09:43:56Z - - - 2011-11-30T09:43:56Z - - - - - - - - - - - - University of Southampton - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Human Development & Health - - - AF - - - - - - - - - - - - - - - - - - - - - - - - Aeronautics, Astronautics & Comp. Eng - - - AK - - - - - - - - - - - - - - - - - - Civil Maritime & Env. Eng & Sci Unit - - - AT - - - - - - - - - - - - - - - - - - - - - Legal Services & Research Governance - - - BB - - - - - - - - - - - - - - - Health & Safety - - - BH - - - 13 - - - - - - Centre for Biological Sciences - - - BJ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Centre for Innovation & Leadership - - - BN - - - - - - - - - - - - - - - Engineering Science Unit - - - BX - - - - - - - - - - - - - - - - - - - - - LATEU - - - BZ - - - - - - - - - - - - - - - Social Sciences - - - CC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Development & Alumni Relations - - - CD - - - - - - - - - - - - - - - - - - - - - - - - Southampton Education School - - - CJ - - - - - - - - - - - - - - - - - - - - - - - - - - - Cancer Sciences - - - CM - - - - - - - - - - - - - - - - - - Chaplaincy - - - CY - - - - - - - - - - - - Human Resources - - - DD - - - - - - - - - - - - - - - - - - - - - Faculty Hub - - - DF - - - - - - - - - - - - - - - Communications - - - DK - - - - - - - - - - - - - - - - - - - - - Chemistry - - - EB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Optoelectronics Research Centre - - - EH - - - - - - - - - - - - - - - - - - - - - Student Services - - - EW - - - - - - 10 - - - - - - - - - Faculty of Business and Law - - - F1 - - - - - - - - - - - - - - - - - - Graphics, Fine Art & Media - - - F1FH010000 - - - - - - Fashion & Textile Design - - - F1FH020000 - - - - - - Technical Services - - - F1FH030000 - - - - - - Research Centre - - - F1FH040000 - - - - - - International Studies - - - F1FH050000 - - - - - - Law - - - F1JJ010000 - - - - - - Management Science - - - F1TR010000 - - - - - - Knowledge & Information Systems - - - F1TR020000 - - - - - - Marketing - - - F1TR030000 - - - - - - Organisational Behaviour - - - F1TR040000 - - - - - - Strategy & Innovation - - - F1TR050000 - - - - - - Accounting - - - F1TR060000 - - - - - - Finance - - - F1TR070000 - - - - - - Academic Related - - - F1TR080000 - - - - - - - - - Faculty of Engineering and the Environment - - - F2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Aerodynamics &Flight Mech Research Group - - - F2AK010000 - - - - - - Astronautics - - - F2AK020000 - - - - - - Computational Engineering & Design - - - F2AK030000 - - - - - - Energy & Climate Change Group - - - F2AT010000 - - - - - - Environment Research Group - - - F2AT020000 - - - - - - Fluid / Structure Interactions Research - - - F2AT030000 - - - - - - Infrastructure Research Group - - - F2AT040000 - - - - - - Tranportation Research Group - - - F2AT050000 - - - - - - Bioengineering Research Group - - - F2BX010000 - - - - - - Electro-Mechanical Research Group - - - F2BX020000 - - - - - - Energy Technology Research Group - - - F2BX030000 - - - - - - Engineering Materials & Surface Engineer - - - F2BX040000 - - - - - - nCATS Research Group - - - F2BX050000 - - - - - - General - - - F2DF010000 - - - - - - Signal Processing & Control Research Grp - - - F2KR010000 - - - - - - Dynamics Research Group - - - F2KR020000 - - - - - - Fluid Dynamics & Acoustics Research Grp - - - F2KR030000 - - - - - - Human Sciences Research Group - - - F2KR040000 - - - - - - Research Institute for Industry - - - F2LH010000 - - - - - - ISVR Consulting - - - F2LH020000 - - - - - - Wolfson Unit MTIA - - - F2LH030000 - - - - - - SOECIC - - - F2LH040000 - - - - - - - - - Faculty of Health Sciences - - - F3 - - - - - - - - - - - - - - - Leadership & Health Systems - - - F3BN010000 - - - - - - Advancing Clinical & Expert Practice - - - F3BN020000 - - - - - - Researcher Development - - - F3BN030000 - - - - - - Family, Child & Psycho-Social Health - - - F3KE020000 - - - - - - Physical & Rehabilitation Health - - - F3KE030000 - - - - - - Bio-Behavioural Sciences - - - F3KE040000 - - - 15 - - - - - - - - - Faculty of Humanities - - - F4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CLS - - - F4GC010000 - - - 13 - - - - - - - - - Faculty of Medicine - - - F5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Human Genetics - - - F5AF010000 - - - - - - Bone & Joint - - - F5AF020000 - - - - - - Epidermiology - - - F5AF030000 - - - - - - Human Nutrition & Metabolism - - - F5AF040000 - - - - - - Maternal, Fetal & Neonatal Physiology - - - F5AF050000 - - - - - - Tissue Infection & Repair - - - F5FC010000 - - - - - - Allergy & Inflammation Research - - - F5FC020000 - - - - - - Clinical Neurosciences - - - F5FC030000 - - - - - - Medical Education Development Unit - - - F5RA010000 - - - - - - Centre for Learning Anatomical Sciences - - - F5RA020000 - - - - - - NETSCC - - - F5VB020000 - - - 12 - - - - - - - - - Faculty of Natural and Environmental Sciences - - - F6 - - - - - - - - - - - - - - - - - - - - - Biological Sciences Technical - - - F6BJ010000 - - - - - - Biological Sciences Research - - - F6BJ020000 - - - - - - Academic - - - F6BJ030000 - - - - - - Molecular and Cellular - - - F6BJ110000 - - - - - - Environmental - - - F6BJ120000 - - - - - - Biomedicine - - - F6BJ130000 - - - - - - Biological Sciences Education/Training - - - F6BJ140000 - - - - - - Support Staff - Technical - - - F6BJ150000 - - - - - - Chemical Biology Group - - - F6EB010000 - - - - - - Electrochemistry & Surface Science Group - - - F6EB020000 - - - - - - Structure & Materials Group - - - F6EB030000 - - - - - - Synthetic Chemistry Group - - - F6EB040000 - - - - - - Support Staff - - - F6EB050000 - - - - - - Chemistry Technical - - - F6EB070000 - - - - - - Computational Systems Chemistry - - - F6EB080000 - - - - - - Electrochemistry - - - F6EB090000 - - - - - - Chemistry Education / Training - - - F6EB110000 - - - - - - Magnetic Resonance - - - F6EB120000 - - - - - - Molecular Assembly, Function & Structure - - - F6EB130000 - - - - - - Molecular Diagnostics & Thereputics - - - F6EB140000 - - - - - - Chemistry Research - - - F6EB150000 - - - - - - Ocean & Earth Science Technical - - - F6HN010000 - - - - - - Coastal & Shelf Research - - - F6HN020000 - - - - - - Geochemistry - - - F6HN030000 - - - - - - Geology & Geophysics - - - F6HN040000 - - - - - - Ocean Biochemistry & Ecosystems - - - F6HN060000 - - - - - - Paleooceanography & Palaeoclimate - - - F6HN070000 - - - - - - Physical Oceanography - - - F6HN080000 - - - - - - - - - Faculty of Physical and Applied Science - - - F7 - - - - - - - - - - - - - - - - - - ORC Research - - - F7EH010000 - - - - - - ORC - Enterprise - - - F7EH020000 - - - - - - Technical Support Staff - - - F7EH040000 - - - - - - ECML - - - F7FP010000 - - - - - - IT Innovation - - - F7FP020000 - - - - - - - - - MECH - - - F7FP030000 - - - - - - NANO - - - F7FP040000 - - - - - - - - - EEE - - - F7FP050000 - - - - - - - - - Comms, Signal Processing & Control - - - F7FP060000 - - - - - - - - - Electronic & Software Systems - - - F7FP070000 - - - - - - - - - Agents, Interactions & Complexity - - - F7FP080000 - - - - - - - - - Web & Internet Science - - - F7FP090000 - - - - - - - - - Theory Group - - - F7WF010000 - - - - - - Astronomy Group - - - F7WF020000 - - - - - - Quantum, Light & Matter Group - - - F7WF030000 - - - - - - Support Staff - - - F7WF040000 - - - - - - - - - Faculty of Social and Human Sciences - - - F8 - - - - - - - - - - - - - - - - - - - - - - - - - - - Social Statistics & Demography - - - F8CC010000 - - - - - - - - - - - - Centre for Population Change (CPC) - - - F8CC010600 - - - - - - ESRC National Centre - Research Methods - - - F8CC010700 - - - - - - Social Work Studies - - - F8CC020000 - - - - - - - - - SWAP - - - F8CC020300 - - - - - - Economics - - - F8CC030000 - - - - - - Politics & International Relations - - - F8CC040000 - - - - - - Sociology & Social Policy - - - F8CC050000 - - - - - - Gerontology - - - F8CC060000 - - - - - - Centre for Contemporary China - - - F8CC070000 - - - - - - Third Sector Research Centre - - - F8CC080000 - - - - - - Leadership School Improve &Effectiveness - - - F8CJ010000 - - - - - - Lifelong & Work-Related Learning - - - F8CJ020000 - - - - - - Mathematics & Science Education - - - F8CJ030000 - - - - - - Social Justice & Inclusive Education - - - F8CJ040000 - - - - - - Teaching Only Staff - - - F8CJ050000 - - - - - - Technical Staff - - - F8CJ060000 - - - - - - Clinical Neuroscience - - - F8JW010000 - - - - - - - - - - - - - - - Developmental Brain-Behaviour Lab - - - F8JW010100 - - - - - - Emotion & Motivation Lab - - - F8JW010200 - - - - - - Animal Behaviour - - - F8JW010300 - - - - - - Cognition - - - F8JW020000 - - - - - - - - - - - - - - - Centre for Visual Cognition - - - F8JW020100 - - - - - - Memory & Associated Learning Lab - - - F8JW020200 - - - - - - CBT - - - F8JW020300 - - - - - - Human Wellbeing - - - F8JW030000 - - - - - - - - - - - - - - - Centre for Apps. of Health Psychology - - - F8JW030100 - - - - - - Centre for Research on Self & Identity - - - F8JW030200 - - - - - - Centre for Sexual Health Research - - - F8JW030300 - - - - - - Technical Staff - - - F8JW040000 - - - - - - Professional Training - - - F8JW050000 - - - - - - Applied Mathematics - - - F8PJ010000 - - - - - - Operational Research - - - F8PJ020000 - - - - - - Pure Mathematics - - - F8PJ030000 - - - - - - Statistics - - - F8PJ040000 - - - - - - Earth Surface Dynamics - - - F8WR010000 - - - - - - Economy, Society & Space - - - F8WR020000 - - - - - - GeoData Institute - - - F8WR030000 - - - - - - Global Env Change & Earth Observation - - - F8WR040000 - - - - - - Palaeoenvironment Laboratory (PLUS) - - - F8WR050000 - - - - - - Population, Health & Wellbeing (PHeW) - - - F8WR060000 - - - - - - Technical Staff - - - F8WR070000 - - - - - - Research Groups - - - F8WT010000 - - - - - - - - - DUMMY - - - F8WT010100 - - - - - - - - - - - - - - - Academic & Research - - - F8WT010101 - - - - - - Maths - - - F8WT010103 - - - - - - Social Sciences - - - F8WT010104 - - - - - - Infection, Inflammation & Immunity - - - FC - - - - - - - - - - - - - - - - - - Winchester School of Art - - - FH - - - - - - - - - - - - - - - - - - - - - - - - Philosophy - - - FJ - - - - - - - - - - - - Electronics & Computer Science - - - FP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Royal Naval Unit - - - FX - - - - - - - - - Modern Languages - - - GC - - - - - - - - - - - - Strategy, Planning and Governance - - - GR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Student & Academic Administration - - - GX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ocean and Earth Science - - - HN - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - iSolutions - - - JF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Southampton Law School - - - JJ - - - - - - - - - - - - Institute for Life Sciences - - - JL - - - - - - - - - Psychology - - - JW - - - - - - - - - - - - - - - - - - - - - - - - - - - Professional Practice in Health Sciences - - - KE - - - - - - - - - - - - - - - - - - - - - Inst. Sound & Vibration Research - - - KR - - - - - - - - - - - - - - - - - - - - - - - - - - - Library - - - KX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Primary Care & Population Sciences - - - LG - - - - - - Enterprise - - - LH - - - - - - - - - - - - - - - - - - - - - Humanities: Central Faculty - - - LN - - - - - - Film - - - LT - - - - - - Archaeology - - - MH - - - - - - - - - - - - Education Hub - - - MM - - - - - - - - - - - - Music - - - NC - - - - - - - - - - - - International Office - - - NP - - - - - - - - - Professional Services - COO - - - P1 - - - - - - - - - - - - - - - - - - - - - - - - - - - Legal Services - - - P1BB010000 - - - - - - - - - General Office - - - P1BB010100 - - - - - - Research Governance Office - - - P1BB020000 - - - - - - B37 Office - - - P1BB030000 - - - - - - HR - Professional Services - - - P1GRDD0200 - - - - - - - - - - - - - - - - - - Employee Relations - - - P1GRDD0210 - - - - - - HR Systems - - - P1GRDD0220 - - - - - - Organisational Development & Design - - - P1GRDD0230 - - - - - - Recruitment, Reward & Talent - - - P1GRDD0240 - - - - - - - - - - - - - - - Reward - - - P1GRDD0241 - - - - - - Temp Bank - - - P1GRDD0242 - - - - - - Recruitment - - - P1GRDD0243 - - - - - - Development - - - P1GRDD0300 - - - - - - - - - Professional Development Unit - - - P1GRDD0310 - - - - - - Equality & Diversity - - - P1GRDD0400 - - - - - - Director's Office - - - P1GRDD0500 - - - - - - Professional Services - Registrar - - - P2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Secretariat - - - P2GR010000 - - - - - - Turner Sims Concert Hall - - - P2GR020000 - - - - - - John Hansard Gallery - - - P2GR030000 - - - - - - Planning & Performance - - - P2GR040000 - - - - - - Transition Project Team - - - P2GR050000 - - - - - - Malaysia Campus Project Team - - - P2GR060000 - - - - - - Vice Chancellor Administration - - - P2GR080000 - - - - - - FOO - Faculty of Business & Law - - - P2TX010000 - - - - - - - - - - - - - - - - - - Faculty Secretariat - - - P2TX010100 - - - - - - Faculty Administration Team - - - P2TX010200 - - - - - - Faculty Resource Team - - - P2TX010300 - - - - - - Faculty Environment Team - - - P2TX010400 - - - - - - FOO - Faculty of Engineering & The Env. - - - P2TX020000 - - - - - - - - - - - - - - - - - - Faculty Secretariat - - - P2TX020100 - - - - - - Faculty Admin for Grants & Projects - - - P2TX020200 - - - - - - Faculty Resource Team - - - P2TX020300 - - - - - - Academic Environment Team - - - P2TX020400 - - - - - - FOO - Faculty of Health Sciences - - - P2TX030000 - - - - - - - - - - - - - - - - - - - - - Faculty Seretariat - - - P2TX030100 - - - - - - Faculty Administration Team - - - P2TX030200 - - - - - - Faculty Resource Team - - - P2TX030300 - - - - - - Faculty Envionment Team - - - P2TX030400 - - - - - - Regional Centre Admin / Reception - - - P2TX030500 - - - - - - FOO - Faculty of Humanities - - - P2TX040000 - - - - - - - - - - - - Faculty Secretariat - - - P2TX040100 - - - - - - Subject Centre - LLAS - - - P2TX040500 - - - - - - FOO - Faculty of Medicine - - - P2TX050000 - - - - - - FOO - Faculty of Natural & Env. Science - - - P2TX060000 - - - - - - - - - - - - - - - - - - Faculty Administration Team - - - P2TX060200 - - - - - - Academic Environment Team - - - P2TX060300 - - - - - - Faculty Resource Team - - - P2TX060400 - - - - - - Externally Funded Projects - - - P2TX060500 - - - - - - FOO - Faculty of Physical & Applied Sci. - - - P2TX070000 - - - - - - - - - - - - - - - Research Administration - - - P2TX070400 - - - - - - Externally Funded Projects - - - P2TX070500 - - - - - - Trading / Enterprise - - - P2TX070600 - - - - - - FOO - Faculty of Social & Human Sciences - - - P2TX080000 - - - - - - - - - - - - - - - Faculty Secretariat - - - P2TX080100 - - - - - - Academic Environment Team - - - P2TX080300 - - - - - - Externally Funded Sci Leaning Cntr SWAP - - - P2TX080400 - - - - - - Mathematics - - - PJ - - - - - - - - - - - - - - - - - - - - - Vice Chancellors Office - - - PK - - - - - - - - - Administration - - - PKBZ010000 - - - - - - Quality Enhancement - - - PKBZ020000 - - - - - - Donor Relations - - - PKCD030000 - - - - - - Annual Giving - - - PKCD050000 - - - - - - Alumni Relations - - - PKCD080000 - - - - - - Major Gift Fundraising - - - PKCD090000 - - - - - - Research, Analytics & Data - - - PKCD100000 - - - - - - Marketing - - - PKGRDK0300 - - - - - - Digital Media - - - PKGRDK0400 - - - - - - Corporate Communications - - - PKGRDK0500 - - - - - - Public Affairs - - - PKGRDK0600 - - - - - - Recruitment, Outreach & Admissions - - - PKGX050000 - - - - - - - - - - - - Outreach - - - PKGX050100 - - - - - - Admissions - - - PKGX050300 - - - - - - Student Administration - - - PKGX060000 - - - - - - - - - - - - Curriculum & Timetabling - - - PKGX060100 - - - - - - Exams, Award & Graduation - - - PKGX060200 - - - - - - Student Information & Records - - - PKGX070000 - - - - - - - - - - - - - - - Business Change - - - PKGX070100 - - - - - - Student Data & Management - - - PKGX070200 - - - - - - Student Records - - - PKGX070300 - - - - - - SAA - Faculty of Business & Law - - - PKGX080000 - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX080100 - - - - - - Student Administration Team - - - PKGX080200 - - - - - - Assessment & Quality Team - - - PKGX080300 - - - - - - Satellite Student & Admin Office - - - PKGX080400 - - - - - - SAA Fac of Engineering & the Environment - - - PKGX090000 - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX090100 - - - - - - Student Admin & Assessment Team - - - PKGX090200 - - - - - - Graduate School Team - - - PKGX090300 - - - - - - Curriculum & Quality Team - - - PKGX090400 - - - - - - SAA - Faculty of Health Sciences - - - PKGX100000 - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX100100 - - - - - - Student Admin & Assessment Team - - - PKGX100200 - - - - - - Curriculum, Quality & Placements Team - - - PKGX100300 - - - - - - SAA - Faculty of Social & Human Sciences - - - PKGX110000 - - - - - - - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX110100 - - - - - - Student Administration Team - - - PKGX110200 - - - - - - Assessment Team - - - PKGX110300 - - - - - - Curriculum & Quality Team - - - PKGX110400 - - - - - - Professional Development - - - PKGX110500 - - - - - - Graduate School - - - PKGX110600 - - - - - - SAA - Faculty of Humanities - - - PKGX120000 - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX120100 - - - - - - Student Administration & Assessment Team - - - PKGX120200 - - - - - - Curriculum & Quality Team - - - PKGX120300 - - - - - - SAA - Fac of Natural & Environmental Sci - - - PKGX130000 - - - - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX130100 - - - - - - Student Administration & Assessment Team - - - PKGX130200 - - - - - - Curriculum & Quality Team - - - PKGX130400 - - - - - - Doctoral Training Centre - - - PKGX130500 - - - - - - NOC - Campus Administration - - - PKGX130600 - - - - - - SAA - Fac of Physical & Applied Sciences - - - PKGX140000 - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX140100 - - - - - - Student Administration & Assessment Team - - - PKGX140200 - - - - - - Curriculum & Quality Team - - - PKGX140300 - - - - - - Doctoral Training Centre - - - PKGX140400 - - - - - - SAA - Faculty of Medicine - - - PKGX150000 - - - - - - - - - - - - - - - - - - - - - Recruitment & Admissions Team - - - PKGX150100 - - - - - - Student Administration - - - PKGX150200 - - - - - - Placements Timetabling Curriculum & Qual - - - PKGX150300 - - - - - - Graduate School - - - PKGX150400 - - - - - - Student Assessment - - - PKGX150500 - - - - - - Director's Office - - - PKGX160000 - - - - - - Service Delivery - - - PKJF110000 - - - - - - - - - - - - - - - - - - Service Desk - - - PKJF110100 - - - - - - Switchboard - - - PKJF110200 - - - - - - ServiceLine Response Team - - - PKJF110300 - - - - - - Coaching & Training - - - PKJF110400 - - - - - - Business Support - - - PKJF120000 - - - - - - - - - - - - - - - Logistics & Distribution / H&S - - - PKJF120100 - - - - - - Admin & Financial Management - - - PKJF120200 - - - - - - Print Centre - - - PKJF120300 - - - - - - E-Learning & Enablement - - - PKJF130000 - - - - - - - - - - - - - - - Managed Learning Environment - - - PKJF130100 - - - - - - E-Learning Enablement - - - PKJF130200 - - - - - - E-Learning Innovation & Production - - - PKJF130300 - - - - - - Research Support - - - PKJF140000 - - - - - - - - - - - - Technical Innovation - - - PKJF140100 - - - - - - HPC Support - - - PKJF140200 - - - - - - Account Management - - - PKJF150000 - - - - - - Service Management & Security - - - PKJF160000 - - - - - - Programme Management - - - PKJF170000 - - - - - - - - - - - - Business & System Analysis - - - PKJF170100 - - - - - - Project Management & Resourcing - - - PKJF170200 - - - - - - Development - - - PKJF180000 - - - - - - - - - - - - - - - Enterprise & Systems Development - - - PKJF180100 - - - - - - Web Systems Development - - - PKJF180200 - - - - - - COTS Systems Development - - - PKJF180300 - - - - - - Operations - - - PKJF190000 - - - - - - - - - - - - - - - Data Centre Operations - - - PKJF190100 - - - - - - Enterprise Systems & Desktop Operations - - - PKJF190200 - - - - - - Applications & Database Operations - - - PKJF190300 - - - - - - ICT Facilities - - - PKJF200000 - - - - - - Hartley Library - - - PKKX020000 - - - - - - Bibliographical Services - - - PKKX070000 - - - - - - Acquisitions - - - PKKX080000 - - - - - - Loans - - - PKKX090000 - - - - - - Digitisation Unit - - - PKKX200000 - - - - - - Librarian's Office - - - PKKX300000 - - - - - - Archives & Special Collections - - - PKKX400000 - - - - - - Faculty Liaison & Site Services - - - PKKX500000 - - - - - - Directorate - - - PKRR010000 - - - - - - Management Accounts - - - PKRR020000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Company & Tax - - - PKRR020600 - - - - - - FFM Team - Business & Law - - - PKRR020700 - - - - - - FFM Team - Engineering - - - PKRR020800 - - - - - - FFM Team - Health Sciences - - - PKRR020900 - - - - - - FFM Team - Humanities - - - PKRR021000 - - - - - - FFM Team - Medicine - - - PKRR021100 - - - - - - FFM Team - Natural & Env Sciences - - - PKRR021200 - - - - - - FFM Team - Physical & App Science - - - PKRR021300 - - - - - - FFM Team - Social & Human Sciences - - - PKRR021400 - - - - - - PSFM Team - CFO - - - PKRR021500 - - - - - - PSFM Team - R & COO - - - PKRR021600 - - - - - - Procurement - - - PKRR030000 - - - - - - - - - - - - - - - Central Procurement - - - PKRR030100 - - - - - - Purchase to Pay - - - PKRR030200 - - - - - - Accounts Payable - - - PKRR030300 - - - - - - Financial Accounts - - - PKRR040000 - - - - - - - - - - - - - - - - - - - - - - - - Student Fees - - - PKRR040300 - - - - - - Payroll & Pensions - - - PKRR040500 - - - - - - Income & Credit Control - - - PKRR040700 - - - - - - Systems Team - - - PKRR040900 - - - - - - Insurance Services - - - PKRR041000 - - - - - - Financial Accounts & Treasury - - - PKRR041100 - - - - - - Planning & Systems - - - PKTD010000 - - - - - - - - - - - - - - - Office Management - - - PKTD010100 - - - - - - Planning - - - PKTD010200 - - - - - - IT & Systems - - - PKTD010300 - - - - - - Facilities - - - PKTD020000 - - - - - - - - - - - - - - - - - - Building Maintenance - - - PKTD020100 - - - - - - - - - - - - - - - - - - Hall & Satellite Campuses - - - PKTD020101 - - - - - - Repairs Service - - - PKTD020102 - - - - - - Locksmiths - - - PKTD020103 - - - - - - Winchester School of Art BM - - - PKTD020104 - - - - - - Helpdesk - - - PKTD020200 - - - - - - Campus Services - - - PKTD020300 - - - - - - - - - - - - - - - Post & Portering - - - PKTD020301 - - - - - - External Services - - - PKTD020302 - - - - - - Domestic Services - - - PKTD020303 - - - - - - Security - - - PKTD020400 - - - - - - Faculty Projects Team - - - PKTD030000 - - - - - - Engineering - - - PKTD040000 - - - - - - - - - - - - - - - - - - - - - M/E Design Team - - - PKTD040100 - - - - - - Electrical Engineering - - - PKTD040200 - - - - - - Utilities - - - PKTD040300 - - - - - - Controls Engineering - - - PKTD040400 - - - - - - Mechanical Engineering - - - PKTD040500 - - - - - - Directorate - - - PKTD050000 - - - - - - - - - Transport - - - PKTD050100 - - - - - - PMU Programme Management Unit - - - PKTD060000 - - - - - - Catering - - - PKTD070000 - - - - - - - - - - - - - - - Halls Catering - - - PKTD070100 - - - - - - Central Catering - - - PKTD070200 - - - - - - Conference & Hospitality - - - PKTD070300 - - - - - - RIS HUB - - - PKTW040000 - - - - - - - - - - - - - - - Legal / IP - - - PKTW040200 - - - - - - Specialist Support Hub - - - PKTW040300 - - - - - - Incubation - - - PKTW040400 - - - - - - RIS Faculty - - - PKTW050000 - - - - - - - - - - - - Research & Enterprise Development - - - PKTW050100 - - - - - - Research Support Team - - - PKTW050200 - - - - - - Projects - - - PKTW060000 - - - - - - - - - SETSquared - - - PKTW060100 - - - - - - English - - - PL - - - - - - Medical Education - - - RA - - - - - - - - - - - - - - - - - - History - - - RG - - - - - - - - - - - - Finance - - - RR - - - - - - - - - - - - - - - - - - - - - Engineering Development Trust - - - SF - - - - - - University Health Service - - - SH - - - - - - - - - Students Union - - - SU - - - - - - - - - - - - - - - Estates & Facilities - - - TD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Southampton Management School - - - TR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Research & Innovation Services - - - TW - - - - - - - - - - - - - - - - - - Faculty Operating Offices - - - TX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Wessex Institute - - - VB - - - - - - - - - Foundation Year - - - VL - - - - - - Physics & Astronomy - - - WF - - - - - - - - - - - - - - - - - - - - - Biomedical Research Facility (BRF) - - - WN - - - - - - Geography & Environment - - - WR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Statistical Sciences Research Institute - - - WT - - - - - - - - - - - - Central Unit - - - XX - - - - - - - - - - - - - - - - - - - - - - - - School Mathematics Project - - - ZA - - diff --git a/res/raw/ormlite_config.txt b/res/raw/ormlite_config.txt index 2268ae9..e69f199 100644 --- a/res/raw/ormlite_config.txt +++ b/res/raw/ormlite_config.txt @@ -1,3 +1,184 @@ # -# generated on 2012/02/19 09:50:39 +# generated on 2012/03/07 11:01:39 # +# --table-start-- +dataClass=net.cbaines.suma.Building +tableName=buildings +# --table-fields-start-- +# --field-start-- +fieldName=name +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=residential +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=outline +dataPersister=SERIALIZABLE +# --field-end-- +# --field-start-- +fieldName=point +dataPersister=SERIALIZABLE +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=id +id=true +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.BusStop +tableName=busstops +# --table-fields-start-- +# --field-start-- +fieldName=description +# --field-end-- +# --field-start-- +fieldName=bay +# --field-end-- +# --field-start-- +fieldName=routes +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=uniLink +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=point +dataPersister=SERIALIZABLE +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=id +id=true +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.BusRoute +tableName=busroutes +# --table-fields-start-- +# --field-start-- +fieldName=id +id=true +# --field-end-- +# --field-start-- +fieldName=code +# --field-end-- +# --field-start-- +fieldName=label +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=forwardDirection +# --field-end-- +# --field-start-- +fieldName=reverseDirection +# --field-end-- +# --field-start-- +fieldName=uniLink +canBeNull=false +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.RouteStop +tableName=routestops +# --table-fields-start-- +# --field-start-- +fieldName=id +generatedId=true +# --field-end-- +# --field-start-- +fieldName=sequence +# --field-end-- +# --field-start-- +fieldName=busStop +columnName=stop_id +foreign=true +indexName=routestops_routestop_idx +# --field-end-- +# --field-start-- +fieldName=busRoute +columnName=route_id +foreign=true +indexName=routestops_routestop_idx +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.Site +tableName=sites +# --table-fields-start-- +# --field-start-- +fieldName=name +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=outline +dataPersister=SERIALIZABLE +# --field-end-- +# --field-start-- +fieldName=point +dataPersister=SERIALIZABLE +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=id +id=true +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.Bus +tableName=buses +# --table-fields-start-- +# --field-start-- +fieldName=gid +generatedId=true +# --field-end-- +# --field-start-- +fieldName=id +# --field-end-- +# --field-start-- +fieldName=route +canBeNull=false +foreign=true +# --field-end-- +# --field-start-- +fieldName=direction +# --field-end-- +# --field-start-- +fieldName=destination +foreign=true +# --field-end-- +# --field-start-- +fieldName=destinationString +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# +# --table-start-- +dataClass=net.cbaines.suma.POI +tableName=poi +# --table-fields-start-- +# --field-start-- +fieldName=point +dataPersister=SERIALIZABLE +canBeNull=false +# --field-end-- +# --field-start-- +fieldName=id +id=true +# --field-end-- +# --table-fields-end-- +# --table-end-- +################################# diff --git a/src/net/cbaines/suma/BusStop.java b/src/net/cbaines/suma/BusStop.java index 750f2d1..85f6d01 100644 --- a/src/net/cbaines/suma/BusStop.java +++ b/src/net/cbaines/suma/BusStop.java @@ -50,8 +50,7 @@ public class BusStop extends POI { String bay; /** - * Used to speed up accessing the relevent uni link routes for a bus stop, - * this is not a uni link stop + * Used to speed up accessing the relevent uni link routes for a bus stop, this is not a uni link stop */ @DatabaseField(canBeNull = false) byte routes; diff --git a/src/net/cbaines/suma/DatabaseConfigUtil.java b/src/net/cbaines/suma/DatabaseConfigUtil.java index 08a54b0..31cc934 100644 --- a/src/net/cbaines/suma/DatabaseConfigUtil.java +++ b/src/net/cbaines/suma/DatabaseConfigUtil.java @@ -22,7 +22,10 @@ package net.cbaines.suma; import com.j256.ormlite.android.apptools.OrmLiteConfigUtil; public class DatabaseConfigUtil extends OrmLiteConfigUtil { + private static final Class[] classes = new Class[] { Building.class, BusStop.class, BusRoute.class, RouteStop.class, + Site.class, Bus.class, POI.class }; + public static void main(String[] args) throws Exception { - writeConfigFile("ormlite_config.txt"); + writeConfigFile("ormlite_config.txt", classes); } } diff --git a/src/net/cbaines/suma/DatabaseHelper.java b/src/net/cbaines/suma/DatabaseHelper.java index 73f4c79..17ef720 100644 --- a/src/net/cbaines/suma/DatabaseHelper.java +++ b/src/net/cbaines/suma/DatabaseHelper.java @@ -55,7 +55,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { private Context context; public DatabaseHelper(Context context) { - super(context, DATABASE_NAME, null, DATABASE_VERSION); + super(context, DATABASE_NAME, null, DATABASE_VERSION, R.raw.ormlite_config); Log.i(TAG, "Database Helper created"); this.context = context; } @@ -89,8 +89,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getBuildingDao() throws SQLException { if (buildingDao == null) { @@ -100,8 +99,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getBusStopDao() throws SQLException { if (busStopDao == null) { @@ -111,8 +109,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getBusRouteDao() throws SQLException { if (busRouteDao == null) { @@ -122,8 +119,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getRouteStopsDao() throws SQLException { if (routeStopsDao == null) { @@ -133,8 +129,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getSiteDao() throws SQLException { if (siteDao == null) { @@ -144,8 +139,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Returns the Database Access Object (DAO) for our SimpleData class. It - * will create it or just give the cached value. + * Returns the Database Access Object (DAO) for our SimpleData class. It will create it or just give the cached value. */ public Dao getBusDao() throws SQLException { if (busDao == null) { @@ -155,8 +149,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Check if the database already exist to avoid re-copying the file each - * time you open the application. + * Check if the database already exist to avoid re-copying the file each time you open the application. * * @return true if it exists, false if it doesn't */ @@ -166,8 +159,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { /* * SQLiteDatabase checkDB = null; * - * try { String myPath = DATABASE_PATH + DATABASE_NAME; checkDB = - * SQLiteDatabase.openDatabase(myPath, null, + * try { String myPath = DATABASE_PATH + DATABASE_NAME; checkDB = SQLiteDatabase.openDatabase(myPath, null, * SQLiteDatabase.OPEN_READONLY); } catch (SQLiteException e) { * * // database does't exist yet. @@ -180,8 +172,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { * * } * - * Log.i(TAG, "Finished checking database"); return checkDB != null ? - * true : false; + * Log.i(TAG, "Finished checking database"); return checkDB != null ? true : false; */ File dbFile = new File(DATABASE_PATH + DATABASE_NAME); @@ -189,9 +180,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Copies your database from your local assets-folder to the just created - * empty database in the system folder, from where it can be accessed and - * handled. This is done by transfering bytestream. + * Copies your database from your local assets-folder to the just created empty database in the system folder, from where it + * can be accessed and handled. This is done by transfering bytestream. * */ public void copyDataBase() throws IOException { Log.i(TAG, "Begining copy database"); @@ -228,8 +218,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { } /** - * Creates a empty database on the system and rewrites it with your own - * database. + * Creates a empty database on the system and rewrites it with your own database. * */ public void createDataBase() throws IOException { diff --git a/src/net/cbaines/suma/POI.java b/src/net/cbaines/suma/POI.java index 485845c..c84f90e 100644 --- a/src/net/cbaines/suma/POI.java +++ b/src/net/cbaines/suma/POI.java @@ -25,54 +25,54 @@ import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; public abstract class POI { - public static final String BUS_STOP = "busstop"; - public static final String BUILDING = "building"; - public static final String WAYPOINT = "waypoint"; - public static final String SITE = "site"; + public static final String BUS_STOP = "busstop"; + public static final String BUILDING = "building"; + public static final String WAYPOINT = "waypoint"; + public static final String SITE = "site"; - public static final String ID_FIELD_NAME = "id"; - public static final String POINT_FIELD_NAME = "point"; + public static final String ID_FIELD_NAME = "id"; + public static final String POINT_FIELD_NAME = "point"; - POI() { - } + POI() { + } - public POI(String id, GeoPoint point) { - this.id = id; - this.point = point; - } + public POI(String id, GeoPoint point) { + this.id = id; + this.point = point; + } - @DatabaseField(dataType = DataType.SERIALIZABLE, canBeNull = false) - public GeoPoint point; + @DatabaseField(dataType = DataType.SERIALIZABLE, canBeNull = false) + public GeoPoint point; - @DatabaseField(id = true) - public String id; + @DatabaseField(id = true) + public String id; - public int distTo = -1; // Used by the comparator to store distances, then later by the gui to display them. + public int distTo = -1; // Used by the comparator to store distances, then later by the gui to display them. - public String type; + public String type; - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - return result; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + return result; + } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - POI other = (POI) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - return true; - } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + POI other = (POI) obj; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + return true; + } } -- cgit v1.2.3