weft-qda 1.0.0 → 1.0.1

data/lib/weft/WEFT-VERSION-STRING.rb

@@ -1 +1 @@
-WEFT_VERSION_STRING = '1.0.0'
+WEFT_VERSION_STRING = '1.0.1'

data/lib/weft/backend/sqlite.rb

@@ -213,6 +213,15 @@ module Backend::SQLite
     raise unless rename_magic
     magic_rename(doc.title)
     retry
+    # something went wrong with SQLite
+  rescue ::SQLite::Exceptions::SQLException => err
+    msg = err.message
+    if msg =~ /too much data/
+      msg = "Document too large to be imported and saved"
+    elsif msg =~ /syntax error/
+      msg = "Document not in plain text format"
+    end
+    raise QDA::Backend::BackendError, msg
   end
   alias :save_doc :save_document
   

data/lib/weft/filters/input.rb

@@ -72,6 +72,8 @@ module Filters
         warn 'PDFtotext Version 3 not found in path; ' <<
              'PDF Filters will not be available'
       end
+    rescue RuntimeError # strange error E_SUCCESS raised in Win98
+      warn 'Error running PDFtotext; PDF Filters will not be available'
     end
 
     def read(file)
@@ -115,4 +117,4 @@ module Filters
     Filters.register_filter(self) if defined?(PDFReader::PDF_TO_TEXT_EXEC)
   end
 end
-end
+end

data/lib/weft/query.rb

@@ -94,7 +94,10 @@ class Query
     end
     
     def calculate()
-      cat = @app.get_category(@identifier, false) # Will raise NotFoundError
+      # TODO - Should raise NotFoundError?
+      cat = @app.get_category(@identifier, false)
+      raise NotFoundError if not cat
+
       @app.get_text_at_category( cat )
     rescue NotFoundError => err
       raise CalculationError,

data/lib/weft/wxgui.rb

@@ -296,7 +296,8 @@ module QDA
                 @app.save_reverse_index(doc.dbid, indexer.words, prog)
               end
               prog.finish()
-            rescue FilterError, UserAbortedException, IOError => err
+            rescue FilterError, UserAbortedException, 
+                   IOError, QDA::Backend::BackendError => err
               prog.finish() if prog
               app.delete_document(doc) if doc && doc.dbid
               ErrorDialog.display( "Document not imported", err.to_s() )

data/lib/weft/wxgui/controls/category_tree.rb

@@ -196,6 +196,12 @@ module QDA::GUI
       destination = get_item_data( to )
       # if for some reason these tree ids didn't correspond to categories...
       return dont_move(from) unless movee and destination
+
+      # ensure that the relevant categories are fully loaded inc codes
+      movee = @client.app.get_category( movee.dbid )
+      # include children
+      destination = @client.app.get_category( destination.dbid, true )
+
       # don't move root nodes
       return dont_move(from) if not movee.parent
       # ignore if no move - target is same as current parent

data/lib/weft/wxgui/controls/textcontrols.rb

@@ -21,9 +21,41 @@ module QDA::GUI
         [ get_insertion_point() - lines,
           get_insertion_point() + get_string_selection().length - lines ]
       end
+
+      # call this with a block that alters the appearance or content of
+      # the text control - this includes call to set_style(), highlight()
+      # as well as changing text content. It reduces flicker and keeps the
+      # viewable area positioned correctly.
+      def save_position()
+        freeze()
+        saved_pos = get_scroll_pos(Wx::VERTICAL)
+
+        # calculate how many pixels it moves when we nudge the scrollbar
+        # down a 'line'
+        scroll_lines(1)
+        pos_down = saved_pos - get_scroll_pos(Wx::VERTICAL)
+        # calculate how many pixels it moves when we nudge the scrollbar
+        # up a 'line'
+        scroll_lines(-1)
+        pos_up = saved_pos - get_scroll_pos(Wx::VERTICAL)
+
+        # how long is a 'line'
+        movement = 0 - pos_down + pos_up
+        yield
+        show_position(0)
+        if movement > 0
+          scroll_lines(saved_pos / movement)
+        end
+        thaw()
+      end
     else 
       # GTK and Mac OS X
       NEWLINE_CORRECTION_FACTOR = 0
+       # a no-op - scroll_pos always returns 0 on Linux?
+      def save_position()
+        yield
+      end
+
       # a no-op
       def true_point(point)
         point
@@ -65,31 +97,7 @@ module QDA::GUI
       index + adjustment
     end
 
-    # call this with a block that alters the appearance or content of
-    # the text control - this includes call to set_style(), highlight()
-    # as well as changing text content. It reduces flicker and keeps the
-    # viewable area positioned correctly.
-    def save_position()
-      freeze()
-      saved_pos = get_scroll_pos(Wx::VERTICAL)
-      # calculate how many pixels it moves when we nudge the scrollbar
-      # down a 'line'
-      scroll_lines(1)
-      pos_down = saved_pos - get_scroll_pos(Wx::VERTICAL)
-      # calculate how many pixels it moves when we nudge the scrollbar
-      # up a 'line'
-      scroll_lines(-1)
-      pos_up = saved_pos - get_scroll_pos(Wx::VERTICAL)
-
-      # how long is a 'line'
-      movement = 0 - pos_down + pos_up
-      yield
-      show_position(0)
-      if movement > 0
-        scroll_lines(saved_pos / movement)
-      end
-      thaw()
-    end
+
   end
 
     

data/lib/weft/wxgui/error_handler.rb

@@ -48,10 +48,24 @@ class CrashReportDialog < Wx::Dialog
                                      Config::CONFIG['MINOR'], 
                                      Config::CONFIG['TEENY'] ].join('.'),
                  'rs2exe'       => rs2exe,
-                 'backtrace'    => ( [ err.inspect ] + 
-                                       err.backtrace ).join("\n") }
+                 'backtrace'    => sanitised_backtrace_string(@err) }
   end
-  
+
+  # return a stringified version of the exception backtrace, removing
+  # any information about the containing filesystem
+  def sanitised_backtrace_string(exception)
+    backtrace = [ err.inspect ] + err.backtrace
+    
+    # check where the libraries are being loaded from
+    lib_dir = File.expand_path( File.join( File.dirname(__FILE__), 
+                                           '..', '..', '..') )
+    lib_dir_rx = /#{Regexp.escape(lib_dir)}/
+
+    # remove this information from backtrace
+    backtrace.map! { | line | line.sub(lib_dir_rx, '') }
+    backtrace.join("\n")
+  end
+
   def crash_details_string
     %w[when weft_version os config 
        ruby_version rs2exe backtrace].inject('') do | str, key |

data/lib/weft/wxgui/inspectors/category.rb

@@ -114,9 +114,14 @@ module QDA
       end
 
       def on_save_memo(e)
+        old_name, old_memo = @cat.name, @cat.memo
         @cat.memo = @memo_box.value
         @cat.name = @name_field.value
         Wx::BusyCursor.busy { @client.app.save_category( @cat ) }
+      rescue NotUniqueNameError
+        ErrorDialog.display( Lang::DUPLICATE_CATEGORY_NAME_TITLE, 
+                             Lang::DUPLICATE_CATEGORY_NAME_WARNING )
+        @cat.name, @cat.memo = old_name, old_memo
       end
 
       def on_change_page(e)

data/lib/weft/wxgui/inspectors/codereview.rb

@@ -27,7 +27,7 @@ module QDA::GUI
       evt_grid_label_left_click() { | evt | on_label_clicked(evt) }
       evt_grid_cell_left_dclick() { | evt | on_cell_dclicked(evt) }
       # the controls panel
-      main_sizer.add(@grid, 1, Wx::GROW|Wx::ALL, 4)
+
       # butt_panel = Wx::Panel.new(panel, -1)
       butt_box_label = Wx::StaticBox.new(panel, -1, 'Select categories')
       bott_sizer = Wx::StaticBoxSizer.new(butt_box_label,
@@ -56,6 +56,7 @@ module QDA::GUI
       main_sizer.add(bott_sizer, 0,
                       Wx::GROW|Wx::ADJUST_MINSIZE|Wx::ALL, 4) 
 
+
       # the numbers row      
       num_box_label = Wx::StaticBox.new(panel, -1, 
                                          Lang::DISPLAY_OPTIONS_LABEL)
@@ -63,8 +64,8 @@ module QDA::GUI
                                            Wx::HORIZONTAL)
       
       # num_cbox = Wx::CheckBox.new(num_panel, -1, 'Show numbers')
-      num_sizer.add( Wx::StaticText.new(panel, -1, 'Count what?'), 
-                     0, Wx::ALL|Wx::ALIGN_RIGHT, 4)
+      # num_sizer.add( Wx::StaticText.new(panel, -1, 'Count what?'), 
+      #               0, Wx::ALL|Wx::ALIGN_RIGHT, 4)
       @num_list = Wx::Choice.new(panel, -1)
       @num_list.append('Number of documents')
       @num_list.append('Number of passages')
@@ -74,9 +75,10 @@ module QDA::GUI
       num_sizer.add(@num_list, 0, Wx::ALL, 4)
 
       main_sizer.add( num_sizer, 0,
-                      Wx::GROW|Wx::ADJUST_MINSIZE|Wx::ALL, 
-                      4)
-      
+                      Wx::GROW|Wx::ADJUST_MINSIZE|Wx::ALL, 4)
+      main_sizer.add(@grid, 1, Wx::GROW|Wx::ALL, 4) 
+
+
       panel.set_sizer(main_sizer)
       main_sizer.set_size_hints(panel)
 

data/lib/weft/wxgui/inspectors/query.rb

@@ -55,6 +55,9 @@ module QDA::GUI
           funcs[i].string_selection = 'CONTAINS WORD'
           args[i].show( 1 )
           args[i].visible_item.value = func.word
+        else
+          Kernel.raise ArgumentError, 
+                       "Unexpected function value #{func.inspect} in query"
         end
 
         

data/test/003-code.rb

@@ -339,10 +339,11 @@ class TestCode < Test::Unit::TestCase
     
     tbl_2 = CodingTable.new()
     result = tbl_2.merge(tbl)
-    assert( tbl_2.key?(3) )
-    assert_equal(1, tbl_2.num_of_docs)
-    assert_equal(6, tbl_2.num_of_chars)
-    assert_equal(1, tbl_2.num_of_codes)
+    # assert( tbl_2.key?(3) )
+    assert_equal(0, tbl_2.num_of_docs)
+    assert_equal(1, result.num_of_docs)
+    assert_equal(6, result.num_of_chars)
+    assert_equal(1, result.num_of_codes)
   end
 
   def test_fragment_table

data/test/055-query_window.rb

@@ -22,7 +22,18 @@ class FakeClient < Wx::App
     @app = QDA::Application.new( QDA::Backend::SQLite )
     @app.start(:dbfile => sample_file('empty.qdp') )
     def @app.get_category(arg, maybe = nil)
-      return QDA::Category.new(arg, nil)
+      case arg
+      when String
+        cat = QDA::Category.new(arg, nil)
+        def cat.dbid()
+          __id__
+        end
+      when Integer
+        cat = ObjectSpace._id2ref(arg)
+      else
+        raise ArgumentError, "Can't fetch #{arg}"
+      end
+      cat
     end
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: weft-qda
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-02-17
+  version: 1.0.1
+date: 2006-04-26
 summary: GUI Qualitative Data Analysis Tool.
 require_paths: 
   - lib