databaseフォルダの自動更新

diff --git a/.gitignore b/.gitignore
index 107128c..72b7be9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
 *.class\r
-*.jar\r
 *.zip\r
-bin/\r
-classes/\r
-sample/\r
-dest/
+bin\r
+classes\r
+sample\r
+dest\r
 \r
 P*-*_GML/\r
 \r
@@ -23,4 +22,4 @@ P*-*_GML/
 .Trashes\r
 Icon?\r
 ehthumbs.db\r
-[Tt]humbs.db
+[Tt]humbs.db\r

diff --git a/.project b/.project
index c5d32bb..fa09c34 100644 (file)
--- a/.project
+++ b/.project
@@ -6,8 +6,23 @@
        </projects>
        <buildSpec>
                <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>full,incremental,</triggers>
                        <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       <value>&lt;project&gt;/.externalToolBuilders/Ant_Builder.launch</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
+                               </dictionary>
                        </arguments>
                </buildCommand>
        </buildSpec>

diff --git a/ConvBusstop.zip b/ConvBusstop.zip
index 89cb24f..89e7f46 100644 (file)
Binary files a/ConvBusstop.zip and b/ConvBusstop.zip differ

diff --git a/build.xml b/build.xml
index f9c6677..77bf02d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
        <!--\r
        ソース以外にビルドに必要なライブラリ\r
        ../hayashi_0225.jar\r
-       ../hsqldb_2_2_8.jar\r
+       ../hsqldb_2_2_9.jar\r
        ../jar-in-jar-loader.zip\r
        -->\r
     <property name="src" value="${basedir}/src" />\r
@@ -31,7 +31,7 @@
        [STEP 2] コンパイル\r
        -->\r
        <target name="compile_src" depends="clean" description="コンパイル src">\r
-           <javac target="1.7" source="1.7" optimize="off" debug="on" verbose="false" srcdir="${src}" destdir="${classes}" encoding="UTF-8" includeantruntime="false">\r
+           <javac target="1.6" source="1.6" optimize="off" debug="on" verbose="false" srcdir="${src}" destdir="${classes}" encoding="UTF-8" includeantruntime="false">\r
                        <include name="**" />\r
                <exclude name="**/*.smap" />\r
 \r

diff --git a/lib/hayashi_0225.jar b/lib/hayashi_0225.jar
new file mode 100644 (file)
index 0000000..00ad366
Binary files /dev/null and b/lib/hayashi_0225.jar differ

diff --git a/lib/hsqldb_2.2.9.jar b/lib/hsqldb_2.2.9.jar
new file mode 100644 (file)
index 0000000..b51f653
Binary files /dev/null and b/lib/hsqldb_2.2.9.jar differ

diff --git a/src/ConvBusstop.bat b/src/ConvBusstop.bat
index 9af83d8..3310564 100644 (file)
--- a/src/ConvBusstop.bat
+++ b/src/ConvBusstop.bat
@@ -1,7 +1,5 @@
-rem del -f database\r
 rem java -cp .;ConvBusstop.jar;hayashi_0225.jar;hsqldb_2.2.9.jar osm.jp.ConvBusroute -nocheck\r
 \r
-del -f database\r
 java -cp .;ConvBusstop.jar;hayashi_0225.jar;hsqldb_2.2.9.jar osm.jp.ConvBusstop -check\r
 \r
 pause
\ No newline at end of file

diff --git a/src/ConvBusstop.sh b/src/ConvBusstop.sh
index 3f5a37d..de0754b 100644 (file)
--- a/src/ConvBusstop.sh
+++ b/src/ConvBusstop.sh
@@ -1,5 +1,3 @@
-#rm -r database\r
 #java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusroute\r
 \r
-rm -r database\r
 java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop -check\r

diff --git a/src/osm/jp/ConvBusroute.java b/src/osm/jp/ConvBusroute.java
index cb19ba6..cbe3acd 100644 (file)
--- a/src/osm/jp/ConvBusroute.java
+++ b/src/osm/jp/ConvBusroute.java
@@ -127,43 +127,10 @@ public class ConvBusroute {
        }\r
 \r
        public static void initDb(Connection con) throws SQLException {\r
-               String createSt;\r
-               PreparedStatement ps;\r
-\r
                // 'table.BUS_STOP'を新規に作る\r
-               DbBusstop.create(con);\r
-\r
                // 'table.bus_route'を新規に作る\r
-               createSt = "CREATE TABLE bus_route (cvid VARCHAR(12), bsc int, boc VARCHAR(128) NOT NULL, bln VARCHAR(512));";\r
-               logger.info(createSt);\r
-               ps = con.prepareStatement(createSt);\r
-               try {\r
-                       ps.executeUpdate();\r
-               }\r
-               catch (SQLException e) {\r
-                       if (!(e.toString().startsWith("Table already exists:"))) {\r
-                               throw e;\r
-                       }\r
-               }\r
-               finally {\r
-                       ps.close();\r
-               }\r
-\r
                // 'table.bus_Curve'を新規に作る\r
-               createSt = "CREATE TABLE bus_Curve (idref VARCHAR(12), seq INT, lat DOUBLE, lon DOUBLE, CONSTRAINT bus_curve_pk PRIMARY KEY(idref,seq));";\r
-               logger.info(createSt);\r
-               ps = con.prepareStatement(createSt);\r
-               try {\r
-                       ps.executeUpdate();\r
-               }\r
-               catch (SQLException e) {\r
-                       if (!(e.toString().startsWith("Table already exists:"))) {\r
-                               throw e;\r
-                       }\r
-               }\r
-               finally {\r
-                       ps.close();\r
-               }\r
+               DbBusstop.create(con);\r
        }\r
 \r
 \r

diff --git a/src/osm/jp/ConvBusstop.java b/src/osm/jp/ConvBusstop.java
index 7d63737..54cfc32 100644 (file)
--- a/src/osm/jp/ConvBusstop.java
+++ b/src/osm/jp/ConvBusstop.java
@@ -358,19 +358,8 @@ public class ConvBusstop {
        }\r
 \r
        public static void initDb(Connection con) throws SQLException {\r
-               String createSt;\r
-\r
                // 'table.BUS_STOP'を新規に作る\r
                DbBusstop.create(con);\r
-\r
-               createSt = "CREATE TABLE existing_data (idref VARCHAR(12) NOT NULL, name VARCHAR(128), lat DOUBLE, lon DOUBLE, CONSTRAINT existing_pk PRIMARY KEY(idref, lat, lon));";\r
-               DbBusstop.create(con, createSt);\r
-               \r
-               createSt = "CREATE TABLE bus_course (code int, type int, corp VARCHAR(128) NOT NULL, course VARCHAR(512), ifile VARCHAR(128), CONSTRAINT bus_course_pk PRIMARY KEY(code));";\r
-               DbBusstop.create(con, createSt);\r
-\r
-               createSt = "CREATE TABLE bus_ref (idref VARCHAR(12), code INT);";\r
-               DbBusstop.create(con, createSt);\r
        }\r
 \r
 \r

diff --git a/src/osm/jp/DbBusstop.java b/src/osm/jp/DbBusstop.java
index f0e56f3..c75062f 100644 (file)
--- a/src/osm/jp/DbBusstop.java
+++ b/src/osm/jp/DbBusstop.java
@@ -5,6 +5,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;\r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
+import java.sql.SQLSyntaxErrorException;\r
+\r
 import jp.co.areaweb.tools.database.*;\r
 \r
 public class DbBusstop {\r
@@ -42,17 +44,45 @@ public class DbBusstop {
         * @throws SQLException\r
         */\r
        public static void create(Connection con) throws SQLException {\r
-               create(con, "CREATE TABLE bus_stop (idref VARCHAR(12) NOT NULL, name VARCHAR(128), lat DOUBLE, lon DOUBLE, fixed INT, ifile VARCHAR(128), CONSTRAINT bus_stop_pk PRIMARY KEY(idref));");\r
+               String createSt;\r
+\r
+               // 'table.BUS_STOP'を新規に作る\r
+               drop(con, "bus_stop");\r
+               createSt = "CREATE TABLE bus_stop (idref VARCHAR(12) NOT NULL, name VARCHAR(128), lat DOUBLE, lon DOUBLE, fixed INT, ifile VARCHAR(128), CONSTRAINT bus_stop_pk PRIMARY KEY(idref));";\r
+               create(con, createSt);\r
+\r
+               drop(con, "existing_data");\r
+               createSt = "CREATE TABLE existing_data (idref VARCHAR(12) NOT NULL, name VARCHAR(128), lat DOUBLE, lon DOUBLE, CONSTRAINT existing_pk PRIMARY KEY(idref, lat, lon));";\r
+               create(con, createSt);\r
+               \r
+               drop(con, "bus_course");\r
+               createSt = "CREATE TABLE bus_course (code int, type int, corp VARCHAR(128) NOT NULL, course VARCHAR(512), ifile VARCHAR(128), CONSTRAINT bus_course_pk PRIMARY KEY(code));";\r
+               create(con, createSt);\r
+\r
+               drop(con, "bus_ref");\r
+               createSt = "CREATE TABLE bus_ref (idref VARCHAR(12), code INT);";\r
+               create(con, createSt);\r
+               \r
+               // 'table.bus_route'を新規に作る\r
+               drop(con, "bus_route");\r
+               createSt = "CREATE TABLE bus_route (cvid VARCHAR(12), bsc int, boc VARCHAR(128) NOT NULL, bln VARCHAR(512));";\r
+               create(con, createSt);\r
+\r
+               // 'table.bus_Curve'を新規に作る\r
+               drop(con, "bus_Curve");\r
+               createSt = "CREATE TABLE bus_Curve (idref VARCHAR(12), seq INT, lat DOUBLE, lon DOUBLE, CONSTRAINT bus_curve_pk PRIMARY KEY(idref,seq));";\r
+               create(con, createSt);\r
        }\r
-       \r
+\r
        public static void create(Connection con, String createsql) throws SQLException {\r
                System.out.println(createsql);\r
                PreparedStatement ps = con.prepareStatement(createsql);\r
                try {\r
                        ps.executeUpdate();\r
                }\r
-               catch (SQLException e) {\r
-                       if (!(e.toString().startsWith("Table already exists:"))) {\r
+               catch (SQLSyntaxErrorException e) {\r
+                       System.out.println("83:"+ e.toString());\r
+                       if (!(e.toString().startsWith("java.sql.SQLSyntaxErrorException: object name already exists:"))) {\r
                                throw e;\r
                        }\r
                }\r
@@ -66,12 +96,22 @@ public class DbBusstop {
         * @param con\r
         * @throws SQLException\r
         */\r
-       public static void drop(Connection con) throws SQLException {\r
-               String createSt = "DROP TABLE bus_stop;";\r
+       public static void drop(Connection con, String tableName) throws SQLException {\r
+               String createSt = "DROP TABLE "+ tableName +";";\r
                System.out.println(createSt);\r
                PreparedStatement ps = con.prepareStatement(createSt);\r
-               ps.executeUpdate();\r
-               ps.close();\r
+               try {\r
+                       ps.executeUpdate();\r
+               }\r
+               catch (SQLSyntaxErrorException e) {\r
+                       System.out.println("107:"+ e.toString());\r
+                       if (!(e.toString().startsWith("java.sql.SQLSyntaxErrorException: user lacks privilege or object not found:"))) {\r
+                               throw e;\r
+                       }\r
+               }\r
+               finally {\r
+                       ps.close();\r
+               }\r
        }\r
        \r
        /**\r