temporal: renamed parameters extrdir/workdir -> directory for consistency (trac https://trac.osgeo.org/grass/ticket/2409) (trunk, https://trac.osgeo.org/grass/changeset/63650)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63651 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/renamed_options

@@ -385,6 +385,17 @@ r3.out.ascii|null:null_value
 # r3.out.vtk
 r3.out.vtk|elevscale:zscale
 #########################
+### Temporal module changes
+#########################
+# t.rast.import
+t.rast.import|extrdir:directory
+# t.rast.export
+t.rast.export|extrdir:directory
+# t.vect.import
+t.vect.import|extrdir:directory
+# t.vect.export
+t.vect.export|extrdir:directory
+#########################
 ### Vector module changes
 #########################
 # v.clean

lib/python/temporal/stds_export.py

@@ -10,11 +10,11 @@ Usage:
     input="temp_1950_2012@PERMANENT"
     output="/tmp/temp_1950_2012.tar.gz"
     compression="gzip"
-    workdir="/tmp"
+    directory="/tmp"
     where=None
     format_="GTiff"
     type_="strds"
-    tgis.export_stds(input, output, compression, workdir, where, format_, type_)
+    tgis.export_stds(input, output, compression, directory, where, format_, type_)
 
 
 (C) 2012-2013 by the GRASS Development Team
@@ -226,7 +226,7 @@ def _export_raster3d_maps(rows, tar, list_file, new_cwd, fs):
 ############################################################################
 
 
-def export_stds(input, output, compression, workdir, where, format_="pack",
+def export_stds(input, output, compression, directory, where, format_="pack",
                 type_="strds"):
     """Export space time datasets as tar archive with optional compression
 
@@ -242,7 +242,7 @@ def export_stds(input, output, compression, workdir, where, format_="pack",
               - "gzip" GNU zip compression
               - "bzip2" Bzip compression
 
-        :param workdir: The working directory used for extraction and packing
+        :param directory: The working directory used for extraction and packing
         :param where: The temporal WHERE SQL statement to select a subset
                       of maps from the space time dataset
         :param format_: The export format:
@@ -265,7 +265,7 @@ def export_stds(input, output, compression, workdir, where, format_="pack",
     old_cwd = os.getcwd()
 
     # Create the temporary directory and jump into it
-    new_cwd = tempfile.mkdtemp(dir=workdir)
+    new_cwd = tempfile.mkdtemp(dir=directory)
     os.chdir(new_cwd)
 
     if type_ == "strds":

lib/python/temporal/stds_import.py

@@ -9,7 +9,7 @@ Usage:
 
     input="/tmp/temp_1950_2012.tar.gz"
     output="temp_1950_2012"
-    extrdir="/tmp"
+    directory="/tmp"
     title="My new dataset"
     descr="May new shiny dataset"
     location=None
@@ -17,7 +17,7 @@ Usage:
     exp=True
     overr=False
     create=False
-    tgis.import_stds(input, output, extrdir, title, descr, location,
+    tgis.import_stds(input, output, directory, title, descr, location,
                     link, exp, overr, create, "strds")
 
 
@@ -171,14 +171,14 @@ def _import_vector_maps(maplist):
 ############################################################################
 
 
-def import_stds(input, output, extrdir, title=None, descr=None, location=None,
+def import_stds(input, output, directory, title=None, descr=None, location=None,
                 link=False, exp=False, overr=False, create=False,
                 stds_type="strds", base=None, set_current_region=False):
     """Import space time datasets of type raster and vector
 
         :param input: Name of the input archive file
         :param output: The name of the output space time dataset
-        :param extrdir: The extraction directory
+        :param directory: The extraction directory
         :param title: The title of the new created space time dataset
         :param descr: The description of the new created
                      space time dataset
@@ -204,8 +204,8 @@ def import_stds(input, output, extrdir, title=None, descr=None, location=None,
     if not os.path.exists(input):
         gscript.fatal(_("Space time raster dataset archive <%s> not found")
                       % input)
-    if not create and not os.path.exists(extrdir):
-        gscript.fatal(_("Extraction directory <%s> not found") % extrdir)
+    if not create and not os.path.exists(directory):
+        gscript.fatal(_("Extraction directory <%s> not found") % directory)
 
     tar = tarfile.open(name=input, mode='r')
 
@@ -219,7 +219,7 @@ def import_stds(input, output, extrdir, title=None, descr=None, location=None,
     if proj_file_name not in members:
         gscript.fatal(_("Unable to find projection file <%s>") % proj_file_name)
 
-    tar.extractall(path=extrdir)
+    tar.extractall(path=directory)
     tar.close()
 
     # We use a new list file name for map registration
@@ -228,7 +228,7 @@ def import_stds(input, output, extrdir, title=None, descr=None, location=None,
     old_cwd = os.getcwd()
 
     # Switch into the data directory
-    os.chdir(extrdir)
+    os.chdir(directory)
 
     # Check projection information
     if not location:

temporal/t.rast.export/t.rast.export.py

@@ -29,7 +29,7 @@
 #%end
 
 #%option G_OPT_M_DIR
-#% key: workdir
+#% key: directory
 #% description: Path to the work directory, default is /tmp
 #% required: no
 #% answer: /tmp
@@ -70,7 +70,7 @@ def main():
     _input = options["input"]
     output = options["output"]
     compression = options["compression"]
-    workdir = options["workdir"]
+    directory = options["directory"]
     where = options["where"]
     _format = options["format"]
 
@@ -78,7 +78,7 @@ def main():
     tgis.init()
     # Export the space time raster dataset
     tgis.export_stds(
-        _input, output, compression, workdir, where, _format, "strds")
+        _input, output, compression, directory, where, _format, "strds")
 
 ############################################################################
 if __name__ == "__main__":

temporal/t.rast.export/test.t.rast.export.sh

@@ -29,13 +29,13 @@ t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test w
 
 # The first @test
 t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.bz2 compression=bzip2 workdir=/tmp
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip workdir=/tmp
-t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no workdir=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.bz2 compression=bzip2 directory=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip directory=/tmp
+t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no directory=/tmp
 
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no workdir=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip directory=/tmp
+t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no directory=/tmp
 
 t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
 t.remove type=strds input=precip_abs1

temporal/t.rast.import/t.rast.import.py

@@ -38,7 +38,7 @@
 #%end
 
 #%option G_OPT_M_DIR
-#% key: extrdir
+#% key: directory
 #% description: Path to the extraction directory
 #%end
 
@@ -100,7 +100,7 @@ def main():
     # Get the options
     input = options["input"]
     output = options["output"]
-    extrdir = options["extrdir"]
+    directory = options["directory"]
     title = options["title"]
     descr = options["description"]
     location = options["location"]
@@ -113,7 +113,7 @@ def main():
 
     tgis.init()
 
-    tgis.import_stds(input, output, extrdir, title, descr, location,
+    tgis.import_stds(input, output, directory, title, descr, location,
                      link, exp, overr, create, "strds", base, 
                      set_current_region)
 

temporal/t.rast.import/test.t.rast.import.relative.sh

@@ -38,37 +38,37 @@ t.create type=strds temporaltype=relative output=precip_rel \
 # The first @test
 t.register type=rast input=precip_rel file="${n1}"  unit="years" 
 
-t.rast.export input=precip_rel output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export.tar compression=no format=GTiff workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar compression=no format=pack workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
-t.rast.export input=precip_rel output=strds_export_pack.tar.bz2 compression=bzip2 format=pack workdir=test
+t.rast.export input=precip_rel output=strds_export.tar.bz2 compression=bzip2 format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export.tar compression=no format=GTiff directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar compression=no format=pack directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
+t.rast.export input=precip_rel output=strds_export_pack.tar.bz2 compression=bzip2 format=pack directory=test
 
 # Checking different flags
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
           -oe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
           -loe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
               title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_rel directory=test\
           -l  title="A test" description="Description of a test"
 
 # Import using different compression and formats
-t.rast.import --o input=strds_export.tar.gz output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar.gz output=precip_rel directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export.tar output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export.tar output=precip_rel directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar output=precip_rel directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.gz output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.gz output=precip_rel directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_rel extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_rel directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
 

temporal/t.rast.import/test.t.rast.import.sh

@@ -37,37 +37,37 @@ t.create type=strds temporaltype=absolute output=precip_abs1 title="A test with
 # The first @test
 t.register -i type=rast input=precip_abs1 file="${n1}"
 
-t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=AAIGrid workdir=test
-t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export.tar compression=no format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar compression=no format=pack workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 format=pack workdir=test
+t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=AAIGrid directory=test
+t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export.tar compression=no format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar compression=no format=pack directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.bz2 compression=bzip2 format=pack directory=test
 
 # Checking different flags
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
           -oe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
           -loe title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
-t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.bz2 output=precip_abs1 directory=test\
           -l  title="A test" description="Description of a test"
 
 # Import using different compression and formats
-t.rast.import --o input=strds_export.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar.gz output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export.tar output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export.tar output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.gz output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
-t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 r.info prec_1
 

temporal/t.rast.import/test.t.rast.import_locations.sh

@@ -35,25 +35,25 @@ t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test w
 # The first @test
 t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
 
-t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
-t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
+t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=GTiff directory=test
+t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack directory=test
 
 g.proj -p
 
 # Import the data into a new location
-t.rast.import --o location=new_test_1 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_1 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 ls -la $GISDBASE/new_test_1/PERMANENT
 
-t.rast.import --o location=new_test_2 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_2 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
           -l  title="A test" description="Description of a test"
 ls -la $GISDBASE/new_test_2/PERMANENT
 
-t.rast.import --o location=new_test_3 input=strds_export.tar.bz2 output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_3 input=strds_export.tar.bz2 output=precip_abs1 directory=test\
           -c  title="A test" description="Description of a test"
 ls -la $GISDBASE/new_test_3/PERMANENT
 
-t.rast.import --o location=new_test_4 input=strds_export_pack.tar.gz output=precip_abs1 extrdir=test\
+t.rast.import --o location=new_test_4 input=strds_export_pack.tar.gz output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 ls -la $GISDBASE/new_test_4/PERMANENT
 

temporal/t.vect.export/t.vect.export.py

@@ -70,7 +70,7 @@ def main():
     _input = options["input"]
     output = options["output"]
     compression = options["compression"]
-    workdir = options["directory"]
+    directory = options["directory"]
     where = options["where"]
     _format = options["format"]
 
@@ -78,7 +78,7 @@ def main():
     tgis.init()
     # Export the space time raster dataset
     tgis.export_stds(
-        _input, output, compression, workdir, where, _format, "stvds")
+        _input, output, compression, directory, where, _format, "stvds")
 
 ############################################################################
 if __name__ == "__main__":

temporal/t.vect.export/test.t.vect.export.sh

@@ -22,13 +22,13 @@ t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" de
 t.register -i type=vector input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
 
 # The first @test
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no directory=/tmp
 
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no directory=/tmp
 
 t.unregister type=vector file="${n1}"
 t.remove type=stvds input=soil_abs1

temporal/t.vect.import/t.vect.import.html

@@ -35,7 +35,7 @@ t.vect.export input=random_locations output=random_locations.tar.gz \
               compression=gzip
 
 t.vect.import input=random_locations.tar.gz output=new_random_locations \
-              base=new_map extrdir=/tmp
+              base=new_map directory=/tmp
 
 t.vect.list new_random_locations
 id|name|layer|mapset|start_time|end_time

temporal/t.vect.import/t.vect.import.py

@@ -89,7 +89,7 @@ def main():
     # Get the options
     input = options["input"]
     output = options["output"]
-    extrdir = options["extrdir"]
+    directory = options["directory"]
     title = options["title"]
     descr = options["description"]
     location = options["location"]
@@ -100,7 +100,7 @@ def main():
 
     tgis.init()
 
-    tgis.import_stds(input, output, extrdir, title, descr, location,
+    tgis.import_stds(input, output, directory, title, descr, location,
                      None, exp, overr, create, "stvds", base)
 
 if __name__ == "__main__":

temporal/t.vect.import/testsuite/test.t.vect.import.sh

@@ -24,36 +24,36 @@ t.create --o type=stvds temporaltype=absolute output=soil_abs1 title="A test" de
 t.register -i type=vector input=soil_abs1 file="${n1}" start='2001-01-01' increment="1 months"
 
 # The first @test
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no workdir=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar.gz compression=gzip directory=/tmp
+t.vect.export format=GML input=soil_abs1 output=stvds_export_gml.tar compression=no directory=/tmp
 
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip workdir=/tmp
-t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no workdir=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.bz2 compression=bzip2 directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar.gz compression=gzip directory=/tmp
+t.vect.export format=pack input=soil_abs1 output=stvds_export_pack.tar compression=no directory=/tmp
 
 # Checking different flags
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
           -oe title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
           -o title="A test" description="Description of a test"
-t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.bz2 output=precip_abs1 directory=test\
               title="A test" description="Description of a test"
 
 # Import using different compression and formats
-t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar.gz output=soil_abs2 directory=test\
               title="A test" description="Description of a test"
 v.info soil_1
-t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_gml.tar output=soil_abs2 directory=test\
               title="A test" description="Description of a test"
 v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar output=soil_abs2 directory=test\
               title="A test" description="Description of a test"
 v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar.gz output=soil_abs2 directory=test\
               title="A test" description="Description of a test"
 v.info soil_1
-t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 extrdir=test\
+t.vect.import --o input=stvds_export_pack.tar.bz2 output=soil_abs2 directory=test\
               title="A test" description="Description of a test"
 v.info soil_1