sqlite2dbf 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa63f4b52e4fa86211371dce58db97f686647c0
-  data.tar.gz: 4ce02a2d7ddd94d3a2371cf05ad823f36c50cb63
+  metadata.gz: a174046549fd4651a2dcabcf6ab907d790f4b0ac
+  data.tar.gz: 24e59b0daac11a547ba42166bbca9c7390255e91
 SHA512:
-  metadata.gz: 6c29cb8c99e820c288e115bb4e6e4582db95895323aed14d9d314447b05a2808484940fed2bdce53af4b6ac7a73ecfd6ecc8008348debf431a909cbccf94d8e5
-  data.tar.gz: 319f49362f9ecedb7e245a0efbbb01dc4efdab06f1798877ac92f1e2a0ca1a1b8d25f369cbdb53b4c95619501d6d0bc9807baddde25fd056ba2a11c0d33a570a
+  metadata.gz: 6928d69a1a10f29487437ea08fdba0fa8df2fd2a4be45295e31992a77d7f75773ac07d4d49c268055fac789d6fd7b54ccf957107ce005d461630aaf54e9a4018
+  data.tar.gz: 32a353698e77bc9a64773af5715053fb302190bf437ec640fb734f2d4c3cd1a645c7c28636a46039b84a51b4cb27c8925643d81b686f52f260403c59feb7244d

data/lib/argparser.rb

@@ -29,12 +29,10 @@ require_relative 'translating'
 require_relative 'constants'
 
 class ArgParser 
-	include Logging
-	include Translating
 
 	self.extend(Logging)
 	self.extend(Translating)
-	@@log = init_logger(STDOUT, Logger::DEBUG)
+	@@log = init_logger()
 
 	# Returns a structure describing the options.
 	#
@@ -68,8 +66,9 @@ class ArgParser
 				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
+			opts.on('-' << trl('o'), trl("--orig [PATH]"), trl('Use the table-name as file-name for the DBF-result, store output in PATH')) do |path|
 				options.table_name = true
+				options.out_dir = path
 			end
 
 =begin

data/lib/constants.rb

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

data/lib/log.conf

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

data/lib/sqlite2dbf.rb

@@ -47,9 +47,13 @@ class SQLite2DBF
 		@time_fields = options.time ? options.time : []
 
 		if(options.source)
+			@dbf_path = nil
 			sqlite_file = options.source	
 			dbf_file = options.target if options.target
-			dbf_file = :table if options.table_name
+			if(options.table_name && options.out_dir)
+				@dbf_path = options.out_dir
+				dbf_file = :table
+			end
 			dbf_file ||= File.dirname(sqlite_file) << File::Separator << File.basename(sqlite_file, '.*')
 			msg = nil
 		
@@ -82,7 +86,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, 'BLOB' => 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' => 0, 'LONGVARCHAR' => 0, 'TEXT' => 0, 'BLOB' => 0, 'INTEGER' => 1, 'FLOAT' => 2, 'REAL' => 2, 'DOUBLE' => 2}
 		# -----------> in a way ... <--------------
 		
 		begin
@@ -95,7 +99,7 @@ class SQLite2DBF
 					@log.debug(tn[0] << ': ' << table_info.join)
 					content = db.execute('select * from ' << tname ) 
 					if(:table == dbf_file)	
-						dbf_name = tname << (content.empty? ? '_empty' : '')<< '.dbf'
+						dbf_name = @dbf_path << File::Separator << tname << (content.empty? ? '_empty' : '')<< '.dbf'
 					else
 						dbf_name = dbf_file.dup << num.to_s << (content.empty? ? '_empty' : '')<< '.dbf'
 					end
@@ -107,7 +111,9 @@ class SQLite2DBF
 						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]
+							type_mapping = tmap.detect{|key, value| field['type'].upcase.start_with?(key) }
+							@log.debug('type_mapping is ' << type_mapping.to_s)
+							ftype = type_mapping[1] if type_mapping && type_mapping.respond_to?(:to_ary)
 							# <---- Yes. I know. ---->
 						end
 
@@ -122,21 +128,22 @@ class SQLite2DBF
 							@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
+									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
+									conv_time = db.execute("select strftime('%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
+									type_mapping = tmap.detect{|key, value| sql_type.upcase.start_with?(key) }
+									ftype = type_mapping[1] if type_mapping && type_mapping.respond_to?(:to_ary)
 									begin
+										dbt.write_string_attribute(record_no, field_index, svalue ) if 0 == ftype
 										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
+									rescue StandardError => ex
 										@log.error(trl("ERROR! cannot write value of type %s" %sql_type) << ': ' << ex.message )
 									end
 								end
@@ -148,6 +155,7 @@ class SQLite2DBF
 					dbt.close
 				end
 			end 
+			puts trl('DONE. Bye.')
 		end
 	rescue SQLite3::Exception => er
 		@log.error trl("ERROR! Cannot read the source-file") << ' (' << sqlite_file << "): %s" %er.message << '.'

data/lib/translations

@@ -75,17 +75,17 @@ o:
   de: t
   fr: t
 
---orig:
- de: --tab
- fr: --tab
+--orig [PATH]:
+ de: --tab [PFAD]
+ fr: --tab [RÉPERTOIRE]
 
 Table-names:
   de: Namen der Tabellen
   fr: Noms des tableaux
 
-Use the table-name as file-name for the DBF-result:
- de: Tabellen-Namen als Dateinamen für die DBF-Ausgabe verwenden
- fr: Utiliser les noms des tableaux comme noms des fichiers DBF
+Use the table-name as file-name for the DBF-result, store output in PATH:
+ de: Tabellen-Namen als Dateinamen für die DBF-Ausgabe verwenden, Ausgabe in PFAD speichern
+ fr: Utiliser les noms des tableaux comme noms des fichiers DBF, écris fichier dans RÉPERTOIRE
 
 ERROR! cannot write value of type INTEGER:
  de: FEHLER! Kann INTEGER-Wert nicht schreiben
@@ -167,5 +167,12 @@ ERROR! Cannot read the source-file:
  de: FEHLER! Kann die Quelldatei nicht lesen
  fr: ERREUR ! Source inlisible
 
+ERROR! cannot write value of type TEXT:
+ de: FEHLER! Kann einen Textwert nicht schreiben
+ fr: ERREUR ! Une valeur de type TEXT ne peut pas être écrit
+
+DONE. Bye.:
+ de: Fertig. Tschüsie.
+ fr: Terminé. À plus.
 
 # eof

data/sqlite2dbf.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.name        = $APPNAME
   s.version     = $VERSION
   s.date        = $DATE
-  s.summary     = "Parameter --dates added for a list of datetime and time fields, Blob as text"
+  s.summary     = "Bug-fix: SQLite types are lower case or upper case. That is not a bug, but I thought they were always upper case. And there are null-types... non-types. Whatever."
   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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Michael Uplawski <michael.uplawski@uplawski.eu>
@@ -51,5 +51,6 @@ rubyforge_project:
 rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
-summary: Parameter --dates added for a list of datetime and time fields, Blob as text
+summary: 'Bug-fix: SQLite types are lower case or upper case. That is not a bug, but
+  I thought they were always upper case. And there are null-types... non-types. Whatever.'
 test_files: []