Merge branch 'issue#115' into develop

Author: Marcin Przepiorowski

lib/Bookmark_obj.pm

@@ -201,7 +201,6 @@ sub createBookmark
     }
     my $db_reference = $db->getReference();
 
-
     my $current_timeflow = $self->{_timeflows}->getCurrentTimeflowForContainer($db_reference);
 
     my $bookmark_timeflow_type;
@@ -244,7 +243,6 @@ sub createBookmark
         # this is to print time stamp of snapshot
         my $snapshots = new Snapshot_obj ($self->{_dlpxObject},$db_reference, 1, $self->{_debug});
         ($temp_time,$temp_timezone) = $snapshots->getLatestSnapshotTime();
-
         my @timesplit = split(' ',$temp_time);
 
         $temp_time = $timesplit[0] . ' ' . $timesplit[1];
@@ -301,6 +299,7 @@ sub createBookmark
        return 0;
     } else {
        print "Creatation of bookmark $name for time $temp_time failed\n";
+       print $result->{error}->{details} . "\n";
        return 1;
     }
 

lib/Snapshot_obj.pm

@@ -962,6 +962,34 @@ sub getSnapshotSize {
 
 }
 
+# Procedure getVDBTimezone
+# parameters:
+# Load 1 snapshot object for a database from Delphix Engine
+
+sub getVDBTimezone
+{
+    my $self = shift;
+    logger($self->{_debug}, "Entering Snapshot_obj::getVDBTimezone",1);
+
+    my $timezone_op = "resources/json/delphix/snapshot?pageSize=1&database=" . $self->{_container};
+    my ($result, $result_fmt) = $self->{_dlpxObject}->getJSONResult($timezone_op);
+    if (defined($result->{status}) && ($result->{status} eq 'OK')) {
+        my @res = @{$result->{result}};
+        if (scalar(@res) > 0) {
+            $self->{_snapshots}->{$res[-1]->{reference}} = $res[-1];
+            $self->{_timezone} = $self->getSnapshotTimeZone($res[-1]->{reference});
+            delete $self->{_snapshots}->{$res[-1]->{reference}};
+        }
+    } else {
+        print "Can't check snapshot timezone \n";
+        exit 1;
+    }
+    if (defined($self->{_timezone})) {
+      return $self->{_timezone};
+    } else {
+      return "N/A";
+    }
+}
 
 # Procedure getSnapshotList
 # parameters: - none
@@ -984,19 +1012,7 @@ sub getSnapshotList
 
         if (defined($self->{_startDate}) || defined($self->{_endDate})  ) {
             # timezone check
-            my $timezone_op = "resources/json/delphix/snapshot?pageSize=1&database=" . $self->{_container};
-            my ($result, $result_fmt) = $self->{_dlpxObject}->getJSONResult($timezone_op);
-            if (defined($result->{status}) && ($result->{status} eq 'OK')) {
-                my @res = @{$result->{result}};
-                if (scalar(@res) > 0) {
-                    $self->{_snapshots}->{$res[-1]->{reference}} = $res[-1];
-                    $self->{_timezone} = $self->getSnapshotTimeZone($res[-1]->{reference});
-                    delete $self->{_snapshots}->{$res[-1]->{reference}};
-                }
-            } else {
-                print "Can't check snapshot timezone \n";
-                exit 1;
-            }
+            $self->getVDBTimezone();
         }
 
         if (defined($self->{_startDate}) && defined($self->{_timezone}) ) {
@@ -1065,7 +1081,8 @@ sub getSnapshotList
 
               for my $snapitem (@res) {
                   $snapshots->{$snapitem->{reference}} = $snapitem;
-                  push(@snapshot_order, $snapitem->{reference});
+                  #push(@snapshot_order, $snapitem->{reference});
+                  unshift @snapshot_order, $snapitem->{reference};
               }
 
               $pageoffset = $self->{_snapshots}->{$snapshot_order[-1]}->{latestChangePoint}->{timestamp};
@@ -1078,6 +1095,7 @@ sub getSnapshotList
           exit 1;
       }
     }
+
 }
 
 1;

lib/VDB_obj.pm

@@ -420,16 +420,50 @@ sub getParentContainer
 
 # Procedure getTimezone
 # parameters: none
-# Return database timezone
+# Return database timezone or N/A
 
 sub getTimezone
 {
     my $self = shift;
     logger($self->{_debug}, "Entering VDB_obj::getTimezone",1);
-    my $tz = $self->{host}->{hostConfiguration}->{operatingSystem}->{timezone};
+    # my $tz = $self->{host}->{hostConfiguration}->{operatingSystem}->{timezone};
+    #
+    # my @tztmp = split(',', $tz);
+    # return $tztmp[0];
 
-    my @tztmp = split(',', $tz);
-    return $tztmp[0];
+    my $timezone;
+
+    if (defined($self->{_timezone})) {
+      return $self->{_timezone}
+    } else {
+      my $timezone_op = "resources/json/delphix/snapshot?pageSize=1&database=" . $self->getReference();
+      my ($result, $result_fmt) = $self->{_dlpxObject}->getJSONResult($timezone_op);
+      if (defined($result->{status}) && ($result->{status} eq 'OK')) {
+          my @res = @{$result->{result}};
+          if (scalar(@res) > 0) {
+              my $snapshot = $res[-1];
+              $timezone = $snapshot->{timezone};
+          }
+      } else {
+          print "Can't check snapshot timezone \n";
+          exit 1;
+      }
+      if (defined($timezone)) {
+        chomp($timezone);
+        my @temp = split(',',$timezone);
+        my $ret = $temp[0];
+
+        if (! ($ret =~ /[a-zA-Z]{3}.\d\d:\d\d/ )) {
+          # if timezone is not GMT+-00:00 format
+          # check if this format can be recognized and amended by checkTZ function
+          $ret = Snapshot_obj::checkTZ(undef, $ret);
+        }
+        $self->{_timezone} = $ret;
+        return $ret;
+      } else {
+        return "N/A";
+      }
+    }
 }