[rkward-cvs] SF.net SVN: rkward: [1277] trunk/rkward/rkward/plugins
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Thu Feb 1 15:13:30 UTC 2007
Revision: 1277
http://svn.sourceforge.net/rkward/?rev=1277&view=rev
Author: tfry
Date: 2007-02-01 07:13:30 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
Simplify CSV import plugin somewhat, and move to import dir
Modified Paths:
--------------
trunk/rkward/rkward/plugins/import_export.pluginmap
trunk/rkward/rkward/plugins/under_development.pluginmap
Added Paths:
-----------
trunk/rkward/rkward/plugins/00saveload/import/import_csv.php
trunk/rkward/rkward/plugins/00saveload/import/import_csv.xml
Removed Paths:
-------------
trunk/rkward/rkward/plugins/00saveload/load/readtable/code.php
trunk/rkward/rkward/plugins/00saveload/load/readtable/description.xml
Copied: trunk/rkward/rkward/plugins/00saveload/import/import_csv.php (from rev 1267, trunk/rkward/rkward/plugins/00saveload/load/readtable/code.php)
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/import/import_csv.php (rev 0)
+++ trunk/rkward/rkward/plugins/00saveload/import/import_csv.php 2007-02-01 15:13:30 UTC (rev 1277)
@@ -0,0 +1,28 @@
+<?
+ function preprocess () {
+ }
+
+ function calculate () {
+getRK("name"); ?> <- read.table (file="<? getRK("file"); ?>", header=<? getRK("header"); ?>, sep=<? getRK("sep"); ?>, dec=<? getRK("dec") ?>, <? # doing row names (what a pity...)
+if (getRK_val("isrow")=="true") {
+ echo( "row.names = ");
+ if (getRK_val("rowname")=="NULL") echo (getRK_val("rowname") . ",");
+ else if (getRK_val("rowname")=="rowcol") echo (getRK("nomrow") . ",");
+ else if (getRK_val("rowname")=="custoRow") echo (getRK_val("rownames") . ",");
+}
+# doing col names (what a pity...)
+if (getRK_val("colname") == "custoCol") echo ( "col.names = " . getRK_val ("colnames") . ",");
+# doing col class (what a pity...)
+if (getRK_val("colclass") == "custoClass") echo( "colClasses = " . getRK_val ("custoClasses") . ",");
+#doing what is left?> na.strings = "<? getRK("na") ?>" , nrows = <? getRK("nrows") ; ?> , skip = <? getRK("skip") ; ?> , check.names = <? getRK("checkname") ; ?> , fill = <? getRK("fill") ; ?> , strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?> ,comment.char = "<? getRK("commentchar") ; ?>" )
+
+<?
+ }
+
+ function printout () {
+ // produce the output
+ }
+
+ function cleanup () {
+ }
+?>
Copied: trunk/rkward/rkward/plugins/00saveload/import/import_csv.xml (from rev 1267, trunk/rkward/rkward/plugins/00saveload/load/readtable/description.xml)
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/import/import_csv.xml (rev 0)
+++ trunk/rkward/rkward/plugins/00saveload/import/import_csv.xml 2007-02-01 15:13:30 UTC (rev 1277)
@@ -0,0 +1,83 @@
+<!DOCTYPE rkplugin>
+<document>
+ <code file="import_csv.php"/>
+ <help file="import_csv.rkh"/>
+ <logic>
+ <external id="filename" />
+ <connect governor="filename" client="file.selection"/>
+
+
+ <connect client="rowname.enabled" governor="isrow.state" />
+
+ <convert id="userow" mode="equals" sources="rowname.string" standard="rowcol" />
+ <convert id="customizerow" mode="equals" sources="rowname.string" standard="custoRow" />
+ <connect client="nomrow.enabled" governor="userow" />
+ <connect client="nomrow.required" governor="userow" />
+ <connect client="rownames.enabled" governor="customizerow" />
+ <connect client="rownames.required" governor="customizerow" />
+
+ <convert id="customizecol" mode="equals" sources="colname.string" standard="custoCol" />
+ <connect client="colnames.enabled" governor="customizecol" />
+ <connect client="colnames.required" governor="customizecol" />
+ <convert id="customizeclasses" mode="equals" sources="colclass.string" standard="custoClass" />
+ <connect client="custoClasses.enabled" governor="customizeclasses" />
+ <connect client="custoClasses.required" governor="customizeclasses" />
+ </logic>
+ <dialog label="Import CSV data" >
+ <tabbook>
+ <tab label="Load" >
+ <browser size="small" id="file" label="File name" />
+ <saveobject id="name" initial="my.csv.data" label="Object to save to"/>
+ <checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="true" label="First row contains column names"/>
+ <row>
+ <radio id="dec" label="Decimal point character" >
+ <option value="'.'" label="'.'" />
+ <option value="','" label="','" />
+ </radio>
+ <radio id="sep" label="Field separator character" >
+ <option value="'\t'" label="Tab" />
+ <option value="';'" label="';'" />
+ <option value="','" label="','" />
+ <option value="' '" label="Space" />
+ </radio>
+ </row>
+ </tab>
+ <tab label="Rows" >
+ <checkbox value_unchecked="false" checked="false" value="true" id="isrow" label="Customize row names" />
+ <radio id="rowname" label="Rows names" >
+ <option value="NULL" label="Number" />
+ <option value="rowcol" label="As specified in column x:" />
+ <option value="custoRow" label="Use a vector" />
+ </radio>
+ <input size="small" id="nomrow" initial="1" label="Column number or variable name" />
+ <input id="rownames" label="Vector of row names (quoted)" />
+ </tab>
+ <tab label="Columns" >
+ <radio id="colname" label="Column names" >
+ <option value="" label="Default" />
+ <option value="custoCol" label="Use a character vector" />
+ </radio>
+ <input id="colnames" label="Vector of column names (quoted)" />
+ <radio id="colclass" label="Classes of columns" >
+ <option value="" label="Default" />
+ <option value="custoClass" label="Use a character vector" />
+ </radio>
+ <input id="custClasses" label="Vector of column classes (quoted)" />
+ </tab>
+ <tab label="Options" >
+ <row>
+ <input size="small" initial="0" id="skip" label="Skip x lines at the start of the file" />
+ <input size="small" initial="-1" id="nrows" label="Max number of lines to read (-1 for no limit)" />
+ </row>
+ <row>
+ <input size="small" initial="NA" id="na" label="Character for missing values" />
+ <input size="small" initial="#" id="commentchar" label="Character for comments" />
+ </row>
+ <checkbox id="fill" checked="false" value="TRUE" value_unchecked="FALSE" label="Fill the rows if unequal length" />
+ <checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="checkname" label="Check syntax of the variables names" />
+ <checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="stripwhite" label="Strip white values" />
+ <checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="blanklinesskip" label="Skip blank lines" />
+ </tab>
+ </tabbook>
+ </dialog>
+</document>
Deleted: trunk/rkward/rkward/plugins/00saveload/load/readtable/code.php
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/load/readtable/code.php 2007-02-01 14:54:51 UTC (rev 1276)
+++ trunk/rkward/rkward/plugins/00saveload/load/readtable/code.php 2007-02-01 15:13:30 UTC (rev 1277)
@@ -1,28 +0,0 @@
-<?
- function preprocess () {
- }
-
- function calculate () {
-getRK("name"); ?> <- read.table (file="<? getRK("file"); ?>", header=<? getRK("header"); ?>, sep=<? getRK("sep"); ?>, dec=<? getRK("dec") ?>, <? # doing row names (what a pity...)
-if (getRK_val("isrow")=="true") {
- echo( "row.names = ");
- if (getRK_val("rowname")=="NULL") echo (getRK_val("rowname") . ",");
- else if (getRK_val("rowname")=="rowcol") echo (getRK("nomrow") . ",");
- else if (getRK_val("rowname")=="custoRow") echo (getRK_val("rownames") . ",");
-}
-# doing col names (what a pity...)
-if (getRK_val("colname") == "custoCol") echo ( "col.names = " . getRK_val ("colnames") . ",");
-# doing col class (what a pity...)
-if (getRK_val("colclass") == "custoClass") echo( "colClasses = " . getRK_val ("custoClasses") . ",");
-#doing what is left?> na.strings = "<? getRK("na") ?>" , nrows = <? getRK("nrows") ; ?> , skip = <? getRK("skip") ; ?> , check.names = <? getRK("checkname") ; ?> , fill = <? getRK("fill") ; ?> , strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?> ,comment.char = "<? getRK("commentchar") ; ?>" )
-
-<?
- }
-
- function printout () {
- // produce the output
- }
-
- function cleanup () {
- }
-?>
Deleted: trunk/rkward/rkward/plugins/00saveload/load/readtable/description.xml
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/load/readtable/description.xml 2007-02-01 14:54:51 UTC (rev 1276)
+++ trunk/rkward/rkward/plugins/00saveload/load/readtable/description.xml 2007-02-01 15:13:30 UTC (rev 1277)
@@ -1,81 +0,0 @@
-<!DOCTYPE rkplugin>
-<document>
- <logic>
- <connect client="rowname.enabled" governor="isrow.state" />
-
- <convert id="userow" mode="equals" sources="rowname.string" standard="rowcol" />
- <convert id="customizerow" mode="equals" sources="rowname.string" standard="custoRow" />
- <connect client="nomrow.enabled" governor="userow" />
- <connect client="nomrow.required" governor="userow" />
- <connect client="rownames.enabled" governor="customizerow" />
- <connect client="rownames.required" governor="customizerow" />
- <connect client="varname.enabled" governor="customizerow" />
-
- <convert id="customizecol" mode="equals" sources="colname.string" standard="custoCol" />
- <connect client="colnames.enabled" governor="customizecol" />
- <connect client="colnames.required" governor="customizecol" />
- <convert id="customizeclasses" mode="equals" sources="colclass.string" standard="custoClass" />
- <connect client="custoClasses.enabled" governor="customizeclasses" />
- <connect client="custoClasses.required" governor="customizeclasses" />
- <convert id="customizecolclass" mode="or" sources="colnames.enabled;custoClasses.enabled" />
- <connect client="varnames.enabled" governor="customizecolclass" />
- </logic>
- <code file="code.php"/>
- <dialog label="Load data" >
- <tabbook>
- <tab label="Load" >
- <browser size="small" id="file" label="File name" />
- <input label="Table name" id="name" initial="rk.temp.table" size="small"/>
- <checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="true" label="First row contains column names"/>
- <radio id="dec" label="Character used decimal points" >
- <option value="'.'" label="'.'" />
- <option value="','" label="','" />
- </radio>
- <radio id="sep" label="Field separator character" >
- <option value="'\t'" label="Tab" />
- <option value="';'" label="';'" />
- <option value="','" label="','" />
- <option value="' '" label="Space" />
- </radio>
- </tab>
- <tab label="Rows" >
- <checkbox value_unchecked="false" checked="false" value="true" id="isrow" label="Customize row names" />
- <radio id="rowname" label="Rows names" >
- <option value="NULL" label="Number" />
- <option value="rowcol" label="Use a column" />
- <option value="custoRow" label="Use a vector" />
- </radio>
- <input size="small" id="nomrow" initial="1" label="Column number or variable name" />
- <varslot multi="false" classes="character" id="rownames" source="varname" label="Row names character vector" />
- <varselector id="varname" />
- </tab>
- <tab label="Columns" >
- <radio id="colname" label="Columns names" >
- <option value="" label="Default" />
- <option value="custoCol" label="Use a character vector" />
- </radio>
- <varslot multi="false" classes="character" id="colnames" source="varnames" label="Column names character vector" />
- <radio id="colclass" label="Classes of columns" >
- <option value="" label="Default" />
- <option value="custoClass" label="Use a character vector" />
- </radio>
- <varslot multi="false" classes="character" id="custoClasses" source="varnames" label="Column names character vector" />
- <varselector id="varnames" />
- </tab>
- <tab label="Options" >
- <row>
- <input size="small" initial="0" id="skip" label="Number of lines" />
- <input size="small" initial="-1" id="nrows" label="Max number of lines" />
- </row>
- <row>
- <input size="small" initial="NA" id="na" label="Character for missing values" />
- <input size="small" initial="#" id="commentchar" label="Character for comments" />
- </row>
- <checkbox id="fill" checked="false" value="TRUE" value_unchecked="FALSE" label="Fill the rows if unequal length" />
- <checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="checkname" label="Check syntax of the variables names" />
- <checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="stripwhite" label="Strip white values" />
- <checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="blanklinesskip" label="Skip blank lines" />
- </tab>
- </tabbook>
- </dialog>
-</document>
Modified: trunk/rkward/rkward/plugins/import_export.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/import_export.pluginmap 2007-02-01 14:54:51 UTC (rev 1276)
+++ trunk/rkward/rkward/plugins/import_export.pluginmap 2007-02-01 15:13:30 UTC (rev 1277)
@@ -3,7 +3,6 @@
<document base_prefix="" namespace="rkward">
<components>
<component type="standard" id="load_r_object" file="00saveload/load/load/description.xml" label="Load an R Object" />
- <component type="standard" id="load_readtable" file="00saveload/load/readtable/description.xml" label="Load data" />
<component type="standard" id="load_source" file="00saveload/load/source/description.xml" label="Load R source" />
<component type="standard" id="save_r_object" file="00saveload/save/save/description.xml" label="Save an R Object" />
@@ -16,7 +15,6 @@
<menu id="file" label="File">
<menu id="import" label="Import" index="4">
<entry component="load_r_object" />
- <entry component="load_readtable" />
<entry component="load_source" />
</menu>
<menu id="export" label="Export" index="5">
Modified: trunk/rkward/rkward/plugins/under_development.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/under_development.pluginmap 2007-02-01 14:54:51 UTC (rev 1276)
+++ trunk/rkward/rkward/plugins/under_development.pluginmap 2007-02-01 15:13:30 UTC (rev 1277)
@@ -7,8 +7,8 @@
<component type="standard" id="import_spss" file="00saveload/import/import_spss.xml" label="Import SPSS">
<attribute id="format" value="*.sav *.por" label="SPSS data files"/>
</component>
- <component type="standard" id="import_csv" file="00saveload/import/import_spss.xml" label="Import SPSS">
- <attribute id="format" value="*.txt *.csv" label="Comma Separate Values"/>
+ <component type="standard" id="import_csv" file="00saveload/import/import_csv.xml" label="Import CSV data">
+ <attribute id="format" value="*.txt *.csv" label="Comma Separated Values"/>
</component>
<component type="standard" id="wilcoxon_test" file="analysis/wilcoxon/wilcoxon_test.xml" label="Wilcoxon Test" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list