rwdgutenberg 0.09 → 0.12

data/code/superant.com.gutenberg/rwdtinkerversion.rb

@@ -1,10 +1,10 @@
-# Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
-# This application is a framework for writing programs from RubyWebDialogs
-# For  information see http://www.rubyforge.net/projects/rwdapplications
-
-# return the version constant defined in the config file
-def rwdgutenberghelpaboutsetup
-return ["RwdGutenberg","(c) 2004,2005 Steven Gibson ","Version #{RwdGutenbergVersion}"]
-end
-
-
+# Application RwdTinker orginally (c) 2004 Steven Gibson under GPL. 
+# This application is a framework for writing programs from RubyWebDialogs
+# For  information see http://www.rubyforge.net/projects/rwdapplications
+
+# return the version constant defined in the config file
+def rwdgutenberghelpaboutsetup
+return ["RwdGutenberg","(c) 2004-2008 Steven Gibson ","Version #{RwdGutenbergVersion}"]
+end
+
+

data/code/superant.com.gutenberg/saveconfigurationrecord.rb

@@ -1,9 +1,9 @@
-  # this method adds a new address record
+  # this method saves a  record
   def saverwdgutenbergconfiguration
    require 'fileutils'
    
-   newname = "rwdwgutenberg-" + RwdGutenbergVersion + ".cnf" # grab the filename to create
-   newdata =@a_gutenconfigurationfile
+   newname = "rwdwgutenberg.cnf" # grab the filename to create
+   newdata = @a_gutenconfigurationfile
 	 
         begin # exception trapped block
           fileName = File.join( ConfigurationDir, newname )
@@ -12,7 +12,7 @@
 	        fd.close
           @newconfigurationresult=newdata # show the record info in the browser
         rescue SystemCallError, StandardError
-            $stderr.print "system call error: " + $!
+            $rwdtinkerlog.error "system call error: #{$!}" 
         end # exception rescue
     
   end

data/code/superant.com.gutenberg/savegutenbergrecord.rb

@@ -1,26 +1,28 @@
   # this method adds a new  record
   def savegutenbergrecord
-   require 'fileutils'
-
+   require 'fileutils'
+
     
    if ! @a_viewgutenberg.to_s.empty?
-   fileName =   $rwdgutenberg_directory + "/" + @a_viewgutenberg.to_s + ".gut" # grab the new filename to create
-  a_gutenbergdata =   @a_gutenbergdatapath.to_s.rstrip+ "\n" +  
-  @a_gutenbergdatainfo.to_s + "\n" +
-   @a_gutenbergdatalocation.to_s + "\n" +
-           @a_gutenbergdatalines.to_s + "\n" + 
+        fileName =   $rwdgutenberg_directory + "/" + @a_viewgutenberg.to_s + ".lnk"    
+       # grab the new filename to create
+      a_gutenbergdata =   @a_gutenbergdatapath.to_s.rstrip+ "\n" +  
+      @a_gutenbergdatainfo.to_s + "\n" +
+      @a_gutenbergdatalocation.to_s + "\n" +
+           @a_gutenbergdatalines.to_s + "\n" + 
            @a_gutenbergdataspeed.to_s + "\n" + 
 	   	       @a_gutenbergdatacomments.to_s + "\n" 
-
+
      begin # exception trapped block
-       puts a_gutenbergdata
+       $rwdtinkerlog.debug a_gutenbergdata
         	fd = File.open(fileName,"w")
 	        fd.print(  a_gutenbergdata) # save the record info to the file
 	        fd.close
       
         rescue SystemCallError, StandardError
-            $stderr.print "system call error: " + $!
+        
+           $rwdtinkerlog.error "savegutenbergrecord: system call error"
         end # exception rescue
-    end
+    end
     
   end

data/code/superant.com.gutenberg/updir.rb

@@ -0,0 +1,7 @@
+   # this method sets the  directory up one
+   def saggutenbergupdir
+ 
+        
+     $temp_rwdgutenberg_directory=   File.dirname( $temp_rwdgutenberg_directory)
+      @gutenberg_directory = $temp_rwdhypernote_directory
+  end

data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb

@@ -28,9 +28,8 @@ def initiateapplet(nametextlocal)
 	
 	debuginitiate = 0
 	
-	if $DEBUG
- $stderr.puts "starting config load with: #{nametextlocal}"
-        end
+	$rwdtinkerlog.info  "initiateapplet: starting config load with: #{nametextlocal}"
+
 
 
   Dir.chdir($progdir )    #changes the current working directory
@@ -45,114 +44,21 @@ begin
 	 
        eval configfileload  #load  config file
        
-     setuphelpaboutoptions # update the help about list
-       setuptinkerdocuments # update the document pull down list
-       runhelpwindow   # update the help menu
-        showjumplinkoptions # update the application link menu
-	runrwdtinkerbackwindow # back to applet window
+    
 	
 	 rescue
-   
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - config load"
-          end
-        debuginitiate += 1
-  end
-  tempguistorage = $rwd_gui_tinker # if gui load fails restore old
-  begin # error trap
-  
-	# build the actual GUI from the gui parts
-  $tempdoc = " "
-  #get a list of the files and subdirectories on the starting directory only
-  a = Array.new(Dir[GuiDir].entries.sort)
-  #loop through the list, ignore the files and add all new directories found
-  a.each do |x|
-	  #if a directory...
-	  if(test(?d,x))
-		  #use this new dir find to add to the original list of directories
-		  @@root = x + "/**"
-		  #adds the new ones to the array
-		  b = Dir[@@root].entries.sort
-		  b.each do |x|
-			  if(test(?d,x))
-				  a.push(x)  #appends to the end of the array...
-			  end
-		  end
-	  end
-  end
-  a.each do |x|
-	  #if it is a file...
-	  if(!test(?d,x)) 
-		  a.delete(x)
-
-	  else #it is a directory...
-		  loadguifile(x + "/**")
-		  
-		  
-	  end
-  end
-
-$rwd_gui_tinker = $tempdoc
-
+	 
+   $rwdtinkerlog.error  "initiateapplet: error in initiateapplets - config load"
+        
   
- rescue
-    $rwd_gui_tinker = tempguistorage # restore old gui
-           if $DEBUG
-              $stderr.puts  "error in initiateapplets - gui building"
-          end
-
         debuginitiate += 1
 end
-
-begin # error trap
-# now load in the code files
-
-$tempdoc  = ""
-tempcodeinstallline  = ""
-
-         @fileName = "installed/" + nametextlocal + ".inf"
-	
-  tmpfilearray = File.readlines(@fileName)
-  
-  tmpfilearray.each do |line|
-	  
-       tempcodeinstallline = line.chomp
-       if tempcodeinstallline.include?('code/')
-	     findfiles(tempcodeinstallline  + "/**")
-            tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
-       end
-end 
-  
-# resultend =  tempcodeinstallline .index("\n",resultstart)
- tempresult  = @fileName
- 
-return " applet loading successful " + tempresult 
-
- rescue
-    if $DEBUG
-              $stderr.puts  "error in initiateapplets - code building"
-          end
-        debuginitiate += 1
-    
-
-  end
+$tempdoc = " "
   
-       if  debuginitiate > 0
-         return " initiateapplet .."
-       else
-	   return " initiateapplet success"
-	end
-
-end
-
-=begin
-
-
   Dir.chdir($progdir) # change back to top program directory
 
   # build the English Language hash file from the parts
-  languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
-  langmessage = {' + "\n"
+  languagehashvariable = 'Message.update('
   startlangdir = File.join(LangDir,"en")
   #get a list of the files and subdirectories on the starting directory only
   alanghash = Array.new(Dir[startlangdir].entries.sort)
@@ -182,7 +88,9 @@ end
 
 
   #writes the contents of doc into the  languagehashvariable 
-  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
+
+  
+  languagehashvariable  =  languagehashvariable + $tempdoc + ' :rwdtinker => "Rwdtinker" ) ;'
 
   # END of en Lang building
   $tempdoc = " "
@@ -218,22 +126,116 @@ end
 
 
   #writes the contents of doc into the variable
-  languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
-
 
+ languagehashvariable =  languagehashvariable  + "  Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
+ 
+  
+    
   $tempdoc = " "
 
   Dir.chdir($progdir) # change back to top program directory
 
-  temp = eval(   languagehashvariable )
+   temp = eval(   languagehashvariable )
 
+  
+  tempguistorage = $rwd_gui_tinker # if gui load fails restore old
+  begin # error trap
+  
+	# build the actual GUI from the gui parts
   $tempdoc = " "
+  #get a list of the files and subdirectories on the starting directory only
+  a = Array.new(Dir[GuiDir].entries.sort)
+  #loop through the list, ignore the files and add all new directories found
+  a.each do |x|
+	  #if a directory...
+	  if(test(?d,x))
+		  #use this new dir find to add to the original list of directories
+		  @@root = x + "/**"
+		  #adds the new ones to the array
+		  b = Dir[@@root].entries.sort
+		  b.each do |x|
+			  if(test(?d,x))
+				  a.push(x)  #appends to the end of the array...
+			  end
+		  end
+	  end
+  end
+  a.each do |x|
+	  #if it is a file...
+	  if(!test(?d,x)) 
+		  a.delete(x)
 
- 
+	  else #it is a directory...
+		  loadguifile(x + "/**")
+		  
+		  
+	  end
+  end
 
+$rwd_gui_tinker = $tempdoc
+
+  
+ rescue
+    $rwd_gui_tinker = tempguistorage # restore old gui
+    
+    $rwdtinkerlog.error  "error in initiateapplets - gui building"
+     
+
+        debuginitiate += 1
+end
+
+begin # error trap
+            # now load in the code files
+
+            $tempdoc  = ""
+              tempcodeinstallline  = ""
+
+            @fileName = "installed/" + nametextlocal + ".inf"
+	    
+	$rwdtinkerlog.debug "initateapplets: loading file: #{@fileName}"
 	
+            tmpfilearray = File.readlines(@fileName)
+  
+            tmpfilearray.each do |line|
+	  
+                        tempcodeinstallline = line.chomp
+                        if tempcodeinstallline.include?('code/')
+	                           findfiles(tempcodeinstallline  + "/**")
+                                    tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
+                        end
+             end 
+
+
+ rescue
+ 
+ $rwdtinkerlog.error "error in initiateapplets - code building"
+   
+        debuginitiate += 1
+    
+
+  end
+  
+          setuphelpaboutoptions # update the help about list
+           setuptinkerdocuments # update the document pull down list
+          runhelpwindow   # update the help menu
+          showjumplinkoptions # update the application link menu
+	  runrwdtinkerbackwindow # back to applet window
+
+         # resultend =  tempcodeinstallline .index("\n",resultstart)
+         tempresult  = @fileName
+ 
+         return " applet loading successful " + tempresult 
+
+
+  
+       if  debuginitiate > 0
+         return " initiateapplet .."
+       else
+	   return " initiateapplet success"
+	end
+
+end
 
 
-=end
 
   

data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb

@@ -1,7 +1,7 @@
 # install rwdtinker applet from a long directory location 
 def installgemapplet
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block
@@ -13,16 +13,18 @@ def installgemapplet
 			zf.extract(entry.to_s, entry.to_s)
 		}
 		
-		rescue
+	rescue
 		
-	if $DEBUG
-	$stderr.puts "unzip error - applet may not be installed correctly"
-       end
-        @installapplettext = " .. "
+		         $rwdtinkerlog.error "installgemapplet: unzip error - applet may not be installed correctly"
 	
-	end # exception rescue
+                           @installapplettext = " .. "
 	
-		@nametextbase = File.basename(nametext)
+        end # exception rescue
+
+                @rwd_ignore_vars << @nametextbase << @returninitiateresults << @installapplettext	
+		tmpnametext = File.basename(nametext)
+		tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!; tmpnametext.chop!
+		@nametextbase = tmpnametext.chop!
 		@returninitateresults = initiateapplet(@nametextbase)
 		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
 

data/code/superant.com.rwdtinkerbackwindow/listzips.rb

@@ -5,8 +5,14 @@ def fillziptoinstallname(inffile)
 	
 end
 
-def  listzipfilestoinstall
-	startlangdir = File.join($progdir, $zipslocation )
+def  listzipfilestoinstall
+	
+	if  $zipslocation.slice(0,1) == "/" ||   $zipslocation.include?(":")
+	    startlangdir = $zipslocation 
+         else	
+	    startlangdir = File.join($progdir, $zipslocation )
+	end
+	
 	#get a list of the files and subdirectories on the starting directory only
 	
 

data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb

@@ -24,14 +24,14 @@
 def removeappletvariables(tempremovename)
 	
  	 begin # exception trapped block
-	 if $DEBUG
-	$stderr.puts "in removeappletvariables"
-	end
+	
+        $rwdtinkerlog.info "in removeappletvariables"
+
 	 # removefileinf = File.open(tempremove){|f| f.read}
 	 
-        temp = tempremovename.gsub("-","_")
-        removemethod =  temp.gsub(".","_")
-       
+        
+        removemethod =  tempremovename
+        
           
         send "#{removemethod}"
 	

data/code/superant.com.rwdtinkerbackwindow/viewappletcontents.rb

@@ -1,7 +1,7 @@
 #view contents of a tinker applet
 def viewappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block

data/code/superant.com.rwdtinkerbackwindow/viewgemappletcontents.rb

@@ -1,7 +1,7 @@
 #view gem info
 def viewgemappletcontents
 	require 'fileutils'
-	require 'extras/zip/zip'
+	require 'lib/zip/zip'
 	nametext = "%s" % [@a_installapplet]
 
 	begin # exception trapped block