diff --git a/.gitignore b/.gitignore index 7afcb7c..fbc9269 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ Icon? ehthumbs.db [Tt]humbs.db +/nbproject/private/ +/build/ +/dist/ \ No newline at end of file diff --git a/doc/db.fuel.class.violet.html b/doc/db.fuel.class.violet.html new file mode 100644 index 0000000..31aacdb --- /dev/null +++ b/doc/db.fuel.class.violet.html @@ -0,0 +1,330 @@ + + + + + + + + + This file was generated with Violet UML Editor 2.1.0. +   ( View Source / Download Violet ) +
+
+ +
+
+ embedded diagram image + + \ No newline at end of file diff --git a/manifest.mf b/manifest.mf new file mode 100644 index 0000000..328e8e5 --- /dev/null +++ b/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/nbbuild.xml b/nbbuild.xml new file mode 100644 index 0000000..b6c1178 --- /dev/null +++ b/nbbuild.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + Builds, tests, and runs the project osmCoverage. + + + diff --git a/src/ImportGML_FUEL.bat b/src/ImportGML_FUEL.bat new file mode 100644 index 0000000..2f1f6e9 --- /dev/null +++ b/src/ImportGML_FUEL.bat @@ -0,0 +1,3 @@ +RD /s database +java -cp .;osmCoverage.jar;hayashi_0225.jar;hsqldb_2.2.9.jar;postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel + diff --git a/src/osm/jp/api/Db.java b/src/osm/jp/api/Db.java new file mode 100644 index 0000000..0da611a --- /dev/null +++ b/src/osm/jp/api/Db.java @@ -0,0 +1,51 @@ +package osm.jp.api; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.SQLSyntaxErrorException; + +public class Db { + /** + * データを受信しないSQLを実行するに作る + * 既にテーブルが存在する時には何もしない + * @param con + * @param createsql + * @throws SQLException + * @throws java.sql.SQLSyntaxErrorException + */ + public static void updateSQL(Connection con, String createsql) throws SQLException, SQLSyntaxErrorException { + System.out.println(createsql); + try (PreparedStatement ps = con.prepareStatement(createsql)) { + ps.executeUpdate(); + } + } + + /** + * 'table.?'を削除するS + * @param con + * @param tableName + * @throws SQLException + */ + public static void drop(Connection con, String tableName) throws SQLException { + String createSt = "DROP TABLE "+ tableName +";"; + System.out.println(createSt); + try (PreparedStatement ps = con.prepareStatement(createSt)) { + ps.executeUpdate(); + } + } + + /** + * 'table.FUEL'の内容を空にする + * @param con + * @param tableName + * @throws SQLException + */ + public static void clear(Connection con, String tableName) throws SQLException { + String createSt = "DELETE FROM "+ tableName +";"; + System.out.println(createSt); + try (PreparedStatement ps = con.prepareStatement(createSt)) { + ps.executeUpdate(); + } + } +} \ No newline at end of file diff --git a/src/osm/jp/coverage/busstop/Busstop.java b/src/osm/jp/coverage/busstop/Busstop.java index 4f140fc..d861539 100644 --- a/src/osm/jp/coverage/busstop/Busstop.java +++ b/src/osm/jp/coverage/busstop/Busstop.java @@ -38,9 +38,10 @@ /** * メイン * - * java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop