sqlite2dbf 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45babe3b6624235add48f6c62c22a5aaccefc294
-  data.tar.gz: bd7ed59177cb0fa945defa4e0413558bcdd5823b
+  metadata.gz: efa63f4b52e4fa86211371dce58db97f686647c0
+  data.tar.gz: 4ce02a2d7ddd94d3a2371cf05ad823f36c50cb63
 SHA512:
-  metadata.gz: c7920489b4c73e5f1799c8cf5a695ad97cd30dfe294b68cf377d9e02e53df306277223197b3fc5a1b8c77008e6dea5140163b87f71cc9c4438f323f58816ce99
-  data.tar.gz: 2dccbcbd83841acb53670181820f58f9cb1df999437f89d492894384a3a52a3dc5b64780097abddb0a4163100f6e1a612a3af7ad4247d8588d79036350397cc3
+  metadata.gz: 6c29cb8c99e820c288e115bb4e6e4582db95895323aed14d9d314447b05a2808484940fed2bdce53af4b6ac7a73ecfd6ecc8008348debf431a909cbccf94d8e5
+  data.tar.gz: 319f49362f9ecedb7e245a0efbbb01dc4efdab06f1798877ac92f1e2a0ca1a1b8d25f369cbdb53b4c95619501d6d0bc9807baddde25fd056ba2a11c0d33a570a

data/lib/argparser.rb

@@ -34,27 +34,39 @@ class ArgParser
 
 	self.extend(Logging)
 	self.extend(Translating)
-	@@log = init_logger()
+	@@log = init_logger(STDOUT, Logger::DEBUG)
 
 	# Returns a structure describing the options.
 	#
 	def self.parse(args)
 		# The options specified on the command line will be collected in <b>options</b>.
 		# We set default values here.
+		
 		options = OpenStruct.new
 		options.debug = false 
+		options.table_name = false
 
 		op = OptionParser.new do |opts|
 			opts.banner = "\n" << trl("Usage") << ":\t" << $APPNAME.dup << ' ' << trl("-s [sqlite-file] [options]") << "\n\t" << trl("or %s [Common options]") %($APPNAME) 
 
 			opts.separator ""
 			opts.separator trl("Specific options") << ':'
-			opts.on('-' << trl("s"), '--' << trl("source/sqlite-file [FILE.sqlite]"), trl( "SQLite-file to read.")) do |source|
+
+			opts.on('-' << trl("s"), '--' << trl("source [FILE.sqlite]"), trl( "SQLite-file to read.")) do |source|
 				options.source = source
 			end
-			opts.on('-' << trl("t"), '--' << trl("dBase-files [FILE(0...n).dbf]"), trl( "Name for the dBase-files (1 per table) to be written.")) do |target|
+
+			opts.on('-' << trl("t"), '--' << trl("target [FILE(0...n).dbf]"), trl( "Name for the dBase-files (1 per table) to be written.")) do |target|
 				options.target = target
 			end
+	
+			opts.on('--' << trl("time [list]"), trl( "A list of space-separated fields (table-columns) which shall be handled as timestamp values.")) do |list|
+				options.time = list.gsub(/[,;]/, '').split
+			end
+			
+			opts.on('--' << trl("dates [list]"), trl( "A list of space-separated fields (table-columns) which shall be handled as date-time values.")) do |list|
+				options.datetime = list.gsub(/[,;]/, '').split
+			end
 
 			opts.on('-' << trl('o'), trl("--orig"), trl('Use the table-name as file-name for the DBF-result')) do
 				options.table_name = true
@@ -83,6 +95,7 @@ end
 			#
 			opts.on_tail(trl("-d"), trl("--debug"), trl("Show debug-messages") ) do
 				options.debug = true
+				@@log.level = Logger::DEBUG
 			end
 
 

data/lib/constants.rb

@@ -1,5 +1,5 @@
 $APPNAME = 'sqlite2dbf'
-$VERSION = '0.1.6'
+$VERSION = '0.1.7'
 $DATE = '2016-11-12'
 $AUTHORS = ["Michael Uplawski <michael.uplawski@uplawski.eu>"]
 $EMAIL = 'michael.uplawski@uplawski.eu'

data/lib/log.conf

@@ -45,6 +45,7 @@ unknown = Logger::UNKNOWN
 # :HtmlBuilder => [info, 'C:\temp\htmlbuilder.log']
 # :HtmlBuilder => [debug, '/tmp/htmlbuilder.log'],
 
+:ArgParser => debug,
 :SQLite2DBF => info,
 
 # And ignore the remainder, too.

data/lib/sqlite2dbf.rb

@@ -43,6 +43,9 @@ class SQLite2DBF
 		@log.level = level	
 		@log.debug('options are: ' << options.to_s)
 
+		@date_fields = options.datetime ? options.datetime : []
+		@time_fields = options.time ? options.time : []
+
 		if(options.source)
 			sqlite_file = options.source	
 			dbf_file = options.target if options.target
@@ -79,7 +82,7 @@ class SQLite2DBF
 
 	def transform(sqlite_file, dbf_file)
 		# <------------ mapping SQLite-types to SHP/XBase ------------>
-		tmap = {'INT' => 1, 'TINYINT' => 1, 'SMALLINT' => 1, 'MEDIUMINT' => 1, 'BIGINT' => 1, 'UNSIGNED BIGINT' => 1, 'VARCHAR' => 0, 'CHARACTER' => 0, 'VARYING CHARACTER(255)' => 0, 'LONGVARCHAR' => 0, 'TEXT' => 0, 'INTEGER' => 1, 'FLOAT' => 2, 'REAL' => 2, 'DOUBLE' => 2}
+		tmap = {'INT' => 1, 'TINYINT' => 1, 'SMALLINT' => 1, 'MEDIUMINT' => 1, 'BIGINT' => 1, 'UNSIGNED BIGINT' => 1, 'VARCHAR' => 0, 'CHARACTER' => 0, 'VARYING CHARACTER(255)' => 0, 'LONGVARCHAR' => 0, 'TEXT' => 0, 'BLOB' => 0, 'INTEGER' => 1, 'FLOAT' => 2, 'REAL' => 2, 'DOUBLE' => 2}
 		# -----------> in a way ... <--------------
 		
 		begin
@@ -100,29 +103,45 @@ class SQLite2DBF
 					dbt = SHP::DBF.create(dbf_name) 
 					table_info.each_with_index do |field, index|
 						ftype = 0 
-						# -----> determine the simple dbf data-type that has to do. <----
-						sql_type = tmap.keys.detect {|kt| field['type'].start_with?(kt) }
-						ftype ||= tmap[sql_type]
-						# <---- Yes. I know. ---->
+						field_name = field['name']
+						if( !@date_fields.include?(field_name) && !@time_fields.include?(field_name) )
+							@log.debug('field is ' << field.to_s)
+							# -----> determine the simple dbf data-type that has to do. <----
+							ftype = tmap.detect{|key, value| field['type'].start_with?(key) }[1]
+							# <---- Yes. I know. ---->
+						end
 
-						dbt.add_field(field['name'], ftype, 200, 0)
+						dbt.add_field(field_name, ftype, 200, 0)
 					end
 
 					content.each_with_index do |row, record_no|
 						@log.debug('row is ' << row.to_s)
 						row.each_with_index do |svalue, field_index|
-							type = table_info[field_index]['type']
-							@log.debug('field is ' << table_info[field_index]['name'] << ', svalue is ' << svalue.to_s << ', type is ' << type)
-							if(svalue)
-								dbt.write_string_attribute(record_no, field_index, svalue ) if 'TEXT' == type
-								begin
-									dbt.write_integer_attribute(record_no, field_index, svalue) if 'INTEGER' == type
-									dbt.write_double_attribute(record_no, field_index, svalue) if 'FLOAT' == type
-								rescue RangeError => ex
-									@log.error(trl("ERROR! cannot write value of type %s" %type) << ': ' << ex.message )
+							sql_type = table_info[field_index]['type']
+							field_name = table_info[field_index]['name']
+							@log.debug('field is ' << field_name << ', svalue is ' << svalue.to_s << ', type is ' << sql_type)
+							if(svalue && !svalue.to_s.empty?)
+								if( @date_fields.include?(field_name) )
+									conv_date = db.execute("select strftime('%Y%m%d %H%M%S', " << svalue.to_s << ", 'unixepoch')").join
+									@log.debug('conv_date is ' << conv_date)
+									dbt.write_string_attribute(record_no, field_index, conv_date)
+								elsif( @time_fields.include?(field_name) )
+									conv_time = db.execute("select strftime('%H%M%S', " << svalue.to_s << ", 'unixepoch')").join
+									@log.debug('conv_time is ' << conv_time)
+									dbt.write_string_attribute(record_no, field_index, conv_time)
+
+								else
+									ftype = tmap.detect{|key, value| sql_type.start_with?(key) }[1]
+									dbt.write_string_attribute(record_no, field_index, svalue ) if 0 == ftype
+									begin
+										dbt.write_integer_attribute(record_no, field_index, svalue) if 1 == ftype
+										dbt.write_double_attribute(record_no, field_index, svalue) if 2 == ftype
+									rescue RangeError => ex
+										@log.error(trl("ERROR! cannot write value of type %s" %sql_type) << ': ' << ex.message )
+									end
 								end
 							else
-								dbt.write_null_attribute(record_no, field_index) if (!svalue || type.empty?)
+								dbt.write_null_attribute(record_no, field_index) if (!svalue || sql_type.empty?)
 							end
 						end
 					end

data/lib/translations

@@ -39,14 +39,32 @@ Specific options:
  de: Spezielle Optionen
  fr: Options spécifiques
 
+#program argument --time
+time [list]:
+ de: zeit [Liste]
+ fr: temps [liste]
+
+A list of space-separated fields (table-columns) which shall be handled as timestamp values.:
+ de: Eine Liste von Feldern (Tabellenspalten), die als Zeitstempel behandelt werden sollen.
+ fr: Une liste de champs (colonnes), qui seront traités comme estampes chronologiques.
+
+# program argument --dates
+dates [list]:
+  de: daten [liste]
+  fr: dates [liste]
+
+A list of space-separated fields (table-columns) which shall be handled as date-time values.:
+  de: Eine Liste von Feldern (Tabellenspalten), die als Datums/Zeit-Werte behandelt werden sollen.
+  fr: Une liste de champs (colonnes), qui seront traités comme dates et temps.
+
 # program argument -s (source)
 s:
  de: q
  fr: s
 
-source/sqlite-file [FILE.sqlite]:
- de: quelle (SQLite) [Datei.sqlite]
- fr: source (SQLite) [Fichier.sqlite]
+source [FILE.sqlite]:
+ de: quelle [Datei.sqlite]
+ fr: source [Fichier.sqlite]
 
 SQLite-file to read.:
  de: SQLite Datei, die gelesen wird.
@@ -78,9 +96,9 @@ t:
  de: z
  fr: c
 
-dBase-files [FILE(0...n).dbf]:
- de: dBase Dateien [Datei(0...n).dbf]
- fr: cible Fichier dBase [Fichier(0...n).dbf]
+target [FILE(0...n).dbf]:
+ de: ziel [Datei(0...n).dbf]
+ fr: cible dBase [Fichier(0...n).dbf]
 
 Name for the dBase-files (1 per table) to be written.:
  de: Name der dBase-Dateien (1 pro Tabelle), die geschrieben werden.

data/sqlite2dbf.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.name        = $APPNAME
   s.version     = $VERSION
   s.date        = $DATE
-  s.summary     = "missing files added."
+  s.summary     = "Parameter --dates added for a list of datetime and time fields, Blob as text"
   s.description = "converts SQLite to DBase"
   s.authors     = $AUTHORS
   s.email       = $EMAIL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite2dbf
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Michael Uplawski <michael.uplawski@uplawski.eu>
@@ -51,5 +51,5 @@ rubyforge_project:
 rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
-summary: missing files added.
+summary: Parameter --dates added for a list of datetime and time fields, Blob as text
 test_files: []