Remove --aggr-virtual-directory (use --aggr-directory instead)

git-svn-id: file:///svnroot/renrot/branches/andy@571 fe2816f4-e837-0410-b10a-f608c9d244a1

2 files changed, 10 insertions, 42 deletions

diff --git a/etc/renrot.conf b/etc/renrot.conf
index 9abbea2..47e7131 100644
--- a/etc/renrot.conf
+++ b/etc/renrot.conf
@@ -74,7 +74,6 @@
 # Possible values are: none, delta or template.
 #aggregation mode		= 'none'
 
-
 # Template used for file aggregation. Interpreted sequences are:
 #	%d  day of the month (01-31)
 #	%H  hour (00-23)
@@ -94,11 +93,6 @@
 # To run virtualized aggregation (see documentation).
 #aggregation virtual		= No
 
-# Default virtual aggregation directory.
-# For now it is imposible to set anything except 'Images.Links.Directory'
-#aggregation virtual directory	= 'Images.Links.Directory'
-
-
 #######################################################################
 #
 # CONTACT SHEET GENERATOR SECTION
@@ -136,7 +130,6 @@
 #contact sheet thm grad fr	= 'FFFFFF'
 #contact sheet thm grad to	= '909090'
 
-
 ## Fonts:
 # 1. to list the TrueType and Postscript Type 1 fonts use
 #    convert -list type
diff --git a/renrot b/renrot
index d06b995..a23771e 100755
--- a/renrot
+++ b/renrot
@@ -78,7 +78,6 @@ my %cfgOpts = (
   'aggregation mode' => 'none',
   'aggregation template' => '%Y%m%d',
   'aggregation virtual' => 0,
-  'aggregation virtual directory' => 'Images.Links.Directory',
   'keywordize' => 0,
   'keywords file' => '.keywords',
   'keywords replace' => 0,
@@ -120,7 +119,6 @@ my $aggrDir;		# counterless directory name for "delta" type aggregation
 my $aggrMode;		# define aggregation mode, possible values are: none, delta or template
 my $aggrTemplate;	# template for the files aggregation taken from CLI
 my $aggrVirtual;	# flag to do links instead real file moving while aggregation
-my $aggrVirtDir;	# directory name for virtual aggregation
 my $backup = 1;		# make or not a backup of the original files
 my $comfile;		# file with commentary
 my $configFile;		# configuration file
@@ -421,7 +419,6 @@ sub getOptions {
       "aggr-mode=s" => \$aggrMode,
       "aggr-template|a=s" => \$aggrTemplate,
       "aggr-virtual!" => \$aggrVirtual,
-      "aggr-virtual-directory=s" => \$aggrVirtDir,
       "backup!" => \$backup,
       "comment-file=s" => \$comfile,
       "config-file|c=s" => \$configFile,
@@ -486,7 +483,6 @@ sub getOptions {
   ldbg3("--aggr-mode: $aggrMode") if (defined $aggrMode);
   ldbg3("--aggr-template: $aggrTemplate") if (defined $aggrTemplate);
   ldbg3("--aggr-virtual: ", boolConv($aggrVirtual)) if (defined $aggrVirtual);
-  ldbg3("--aggr-virtual-directory: $aggrVirtDir") if (defined $aggrVirtDir);
   ldbg3("--backup: ", boolConv($backup));
   ldbg3("--comment-file: $comfile") if (defined $comfile);
   ldbg3("--config-file: $configFile") if (defined $configFile);
@@ -607,8 +603,8 @@ sub trimValue {
 }
 
 ########################################################################################
-# Usage      : parsePair() gets (key, value) pair from the string
-#            : like [multiword] key = "value"
+# Usage      : parsePair() gets (key, value) pair from the string like
+#            : [multiword] key = "value"
 # Purpose    : parses pairs of data
 # Returns    : $key, $value  string
 # Parameters : string like [multiword] key = "value"
@@ -1123,7 +1119,7 @@ sub aggregationProcess {
   my $counterSize = shift;
   my $file;
   my $info;
-  my $BaseDir;
+  my $BaseDir = $cfgOpts{'aggregation directory'};
   my $NewDir;
   my $file_num = scalar(keys(%filenameshash));
   my $file_rem = 0;
@@ -1131,11 +1127,6 @@ sub aggregationProcess {
   procmsg ("AGGREGATION\n");
   procmsg ("===========\n");
 
-  if ($cfgOpts{'aggregation virtual'} == 0) {
-    $BaseDir = $cfgOpts{'aggregation directory'};
-  } else {
-    $BaseDir = $cfgOpts{'aggregation virtual directory'};
-  }
   makeDir($BaseDir);
 
   if ($cfgOpts{'aggregation mode'} eq "template") {
@@ -1966,8 +1957,6 @@ Aggregating options:
       --aggr-directory <DIR>	aggregation directory name
   -a, --aggr-template <TPL>	aggregation template (see manual for details)
       --aggr-virtual (*)	virtual aggregation (symlinks instead of files)
-      --aggr-virtual-directory <DIR>
-                                root directory for virtual aggregation
 
 Contact Sheet options (CS):
       --cs (*)			create the CS
@@ -2180,7 +2169,6 @@ $cfgOpts{'aggregation directory'}	= $aggrDir if (defined $aggrDir);
 $cfgOpts{'aggregation mode'}	        = $aggrMode if (defined $aggrMode);
 $cfgOpts{'aggregation template'}	= $aggrTemplate if (defined $aggrTemplate);
 $cfgOpts{'aggregation virtual'}	        = $aggrVirtual if (defined $aggrVirtual);
-$cfgOpts{'aggregation virtual directory'} = $aggrVirtDir if (defined $aggrVirtDir);
 $cfgOpts{'keywordize'}                  = $keywordize if (defined $keywordize);
 $cfgOpts{'keywords file'}       	= $keywordsFile if (defined $keywordsFile);
 $cfgOpts{'keywords replace'}    	= $keywordsReplace if (defined $keywordsReplace);
@@ -2551,7 +2539,9 @@ B<--aggr-directory> option and the directory name counter.
 =item B<--aggr-directory> F<DIR>
 
 Aggregation directory name prefix (default is I<Images>), have to be on the
-same file system, relative to the current working directory or an absolute path.
+same file system (or on the file system which supports symbolic links in case
+of virtual aggregation), relative to the current working directory or an
+absolute path.
 
 =item B<-a> or B<--aggr-template> I<TEMPLATE>
 
@@ -2564,20 +2554,10 @@ option. For practical uses, see L</TEMPLATE EXAMPLES> section.
 
 =item B<--aggr-virtual>, B<--no-aggr-virtual>
 
-Defines virtualization for existent aggregation modes. If set, resulting files
-are placed into the directory given by the command line option
-B<--aggr-virtual-directory> or configuration file option B<aggregation virtual
-directory> then any changes required by the current aggregation mode are
-applied. The main effect of B<--aggr-virtual> is that any files to be
-aggregated remain untouched in their places, and symlinks pointing to them are
-stored in the directory tree created. Use B<--no-aggr-virtual> to prevent
-virtualization.
-
-=item B<--aggr-virtual-directory> F<DIR>
-
-Virtual aggregation directory name prefix (default is
-I<Images.Links.Directory>), have to be on the file system which is supported
-symbolic links, relative to the current working directory or an absolute path.
+Defines virtualization for existent aggregation modes. The main effect of
+B<--aggr-virtual> is that any files to be aggregated remain untouched in their
+places, and relative symbolic links pointing to them are stored in the
+directory tree created. Use B<--no-aggr-virtual> to prevent virtualization.
 
 =item B<--comment-file> F<FILE>
 
@@ -2852,11 +2832,6 @@ B<--aggr-template>, for the description).
 Defines virtualization for the existing aggregation modes (see the
 B<--aggr-virtual> option).
 
-=item B<aggregation virtual directory>
-
-Defines a directory for virtual aggregation (see the
-B<--aggr-virtual-directory> option>).
-
 =item B<Tag>, B<TagFile>
 
 Refer to the section L</TAGS>, for the detailed description