issue #219 plus file mapping support for MS SQL

Author: Marcin Przepiorowski

bin/dx_v2p.pl

@@ -108,12 +108,6 @@
 }
 
 
-if ( ( ( $type eq 'oracle') || ( $type eq 'mssql') ) && (! defined($targetDirectory)) ) {
-  print "Option targetDirectory is required. \n";
-  pod2usage(-verbose => 1,  -input=>\*DATA);
-  exit (1);
-}
-
 
 # this array will have all engines to go through (if -d is specified it will be only one engine)
 my $engine_list = Toolkit_helpers::get_engine_list($all, $dx_host, $engine_obj);
@@ -199,7 +193,7 @@
     }
 
     if ( defined($map_file) ) {
-      my $filemap_obj = new FileMap($engine_obj,$debug);
+      my $filemap_obj = new FileMap($engine_obj,$type,$debug);
       $filemap_obj->loadMapFile($map_file);
       $filemap_obj->setSource($source);
       if ($filemap_obj->validate()) {
@@ -228,10 +222,24 @@
   elsif ($type eq 'mssql') {
 
     if ( $db->setFileSystemLayout($targetDirectory,$archiveDirectory,$dataDirectory,$externalDirectory,$scriptDirectory,$tempDirectory) ) {
+      print Dumper "ale tu";
       print "Problem with export file system layout. Is targetDiretory and dataDirectory set ?\n";
       exit(1);
     }
 
+    if ( defined($map_file) ) {
+      my $filemap_obj = new FileMap($engine_obj,$type,$debug);
+      $filemap_obj->loadMapFile($map_file);
+      $filemap_obj->setSource($source);
+      if ($filemap_obj->validate($db->{"NEWDB"}->{"filesystemLayout"})) {
+        die ("Problem with mapping file. V2P process won't be created.")
+      }
+
+      $db->setMapFileV2P($filemap_obj->GetMapping_rule());
+
+    }
+
+
     if (defined($norecovery)) {
       $db->setNoRecovery();
     }
@@ -341,7 +349,20 @@ =head2 V2P arguments
 Target VDB template name (for Oracle)
 
 =item B<-mapfile>
-Target VDB mapping file (for Oracle)
+Target VDB mapping file. Use colon as separator for both MS SQL and Oracle
+Dxtoolkit will use a proper separator for API call. 
+
+
+Oracle mapfile example:
+
+# this is comment
+/u01:/u02
+
+MS SQL mapfile example:
+
+# this is comment
+Biscuit_Data_1.ndf : c:\\tmp\\los1\\slon_Data_1.ndf
+Biscuit_Bogus_1_data.ndf : c:\\tmp\\los2\\slon_Bogus_1_data.ndf
 
 =item B<-instname>
 Target VDB instance name (for Oracle)

lib/FileMap.pm

@@ -38,12 +38,14 @@ use Toolkit_helpers qw (logger);
 sub new {
     my $classname  = shift;
     my $dlpxObject = shift;
+    my $type = shift;
     my $debug = shift;
     logger($debug, "Entering FileMap::constructor",1);
 
     my %hosts;
     my $self = {
         _hosts => \%hosts,
+        _type => $type,
         _dlpxObject => $dlpxObject,
         _debug => $debug
     };
@@ -66,13 +68,20 @@ sub setMapFile {
 
     $self->{_mapping_rule_hash} = $mapfile;
 
+    my $join_char;
+    if (lc $self->{_type} eq 'mssql') {
+        $join_char = "?";
+    } else {
+        $join_char = ":";
+    }
+
     my $mapping_rule_de = '';
 
     while ( my ($key,$value) = each %{$mapfile} ) {
         if ($mapping_rule_de eq '') {
-            $mapping_rule_de = $key . ":" . $value;
+            $mapping_rule_de = $key . $join_char . $value;
         } else {
-            $mapping_rule_de = $mapping_rule_de . "\n" . $key . ":" . $value;
+            $mapping_rule_de = $mapping_rule_de . "\n" . $key . $join_char . $value;
         }
     }
 
@@ -94,12 +103,26 @@ sub loadMapFile {
 
     open (my $FD, $file) or die ("Can't open file $file : $!");
 
+    my $split_char;
+
+    if (lc $self->{_type} eq 'mssql') {
+        $split_char = ":";
+    } else {
+        $split_char = ":";
+    }
+    
     while(my $line = <$FD>) {
         chomp $line;
         if ($line =~ m/^#/ ) {
             next;
         }
-        my @line_split = split (":",$line);
+        if ($line =~ m/^$/ ) {
+            next;
+        }
+        my @line_split = split ($split_char,$line, 2);
+
+        $line_split[0] =~ s/^\s+|\s+$//g;
+        $line_split[1] =~ s/^\s+|\s+$//g;
 
         if (! defined($line_split[0])) {
             die ("Line $line in file $file has an error. Check if there is colon sign. Can't continue");
@@ -114,7 +137,6 @@ sub loadMapFile {
     }
 
     close $FD;
-
     $self->setMapFile(\%map_hash);
 
 }
@@ -140,16 +162,22 @@ sub setSource {
 
 sub validate {
     my $self = shift;
+    my $filesystemLayout = shift;
     my %fileMapping_request;
     logger($self->{_debug}, "Entering FileMap::validate",1);
 
+    if (lc $self->{_type} eq 'mssql') {
+        $fileMapping_request{"type"} = "MSSqlFileMappingParameters";
+        $fileMapping_request{"filesystemLayout"} = $filesystemLayout;
+    } else {
+        $fileMapping_request{"type"} = "FileMappingParameters";
+    }
+
     if (version->parse($self->{_dlpxObject}->getApi()) < version->parse(1.9.0)) {
-      $fileMapping_request{"type"} = "FileMappingParameters";
       $fileMapping_request{"mappingRules"} = $self->{_mapping_rule};
       $fileMapping_request{"timeflowPointParameters"}{"type"} = "TimeflowPointSemantic";
       $fileMapping_request{"timeflowPointParameters"}{"container"} = $self->{_source_ref};
     } else {
-      $fileMapping_request{"type"} = "FileMappingParameters";
       $fileMapping_request{"mappingRules"} = $self->{_mapping_rule};
       my %timeflowhash = (
         "type"=>"TimeflowPointSemantic",

lib/MSSQLVDB_obj.pm

@@ -326,12 +326,10 @@ sub setFileSystemLayout {
       $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "MSSqlTimeflowFilesystemLayout";
     }
 
-    if (! defined($targetDirectory)) {
-        return 1;
+    if (defined($targetDirectory)) {
+        $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
     }
 
-    $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
-
     if (defined($dataDirectory)) {
         $self->{"NEWDB"}->{"filesystemLayout"}->{"dataDirectory"} = $dataDirectory;
     } else {
@@ -357,8 +355,12 @@ sub setFileSystemLayout {
 
     if ( defined($externalDirectory)) {
         $self->{"NEWDB"}->{"filesystemLayout"}->{"externalDirectory"} = $externalDirectory;
+    } else {
+        $self->{"NEWDB"}->{"filesystemLayout"}->{"scriptDirectory"} = "external";
     }
 
+    return undef;
+
 }
 
 

lib/OracleVDB_obj.pm

@@ -2505,11 +2505,11 @@ sub setFileSystemLayout {
       $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "OracleExportTimeflowFilesystemLayout";
     }
 
-    if (! defined($targetDirectory)) {
-        return 1;
+    if (defined($targetDirectory)) {
+        $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
     }
 
-    $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
+    
 
     if ( defined($archiveDirectory)) {
         $self->{"NEWDB"}->{"filesystemLayout"}->{"archiveDirectory"} = $archiveDirectory;

lib/VDB_obj.pm

@@ -1963,12 +1963,10 @@ sub setFileSystemLayout {
 
     $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "TimeflowFilesystemLayout";
 
-    if (! defined($targetDirectory)) {
-        return 1;
+    if (defined($targetDirectory)) {
+        $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
     }
 
-    $self->{"NEWDB"}->{"filesystemLayout"}->{"targetDirectory"} = $targetDirectory;
-
     if ( defined($archiveDirectory)) {
         $self->{"NEWDB"}->{"filesystemLayout"}->{"archiveDirectory"} = $archiveDirectory;
     }