X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=lib%2FClearcase%2FView.pm;h=79dea0262868005007039975e62f768399bbc172;hb=0c802537ec02d6cfea4c41b3138535c09a319489;hp=77cfc6a9f5a156e14c7bf4e0de3e95ba1530eb48;hpb=1140ca8d56832ae529db0f353112ac192cdf9432;p=clearscm.git

diff --git a/lib/Clearcase/View.pm b/lib/Clearcase/View.pm
index 77cfc6a..79dea02 100644
--- a/lib/Clearcase/View.pm
+++ b/lib/Clearcase/View.pm
@@ -46,9 +46,9 @@ fields they are expanded.
 
  display_nolf MAGENTA   . "Additional groups:\t";
 
- foreach ($view->additional_groups) {
+ for ($view->additional_groups) {
    display_nolf "$_ ";
- } # foreach
+ } # for
 
  display '';
 
@@ -127,8 +127,8 @@ use warnings;
 use Clearcase;
 use Display; 
 
-sub new ($) {
-  my ($class, $tag) = @_;
+sub new ($;$) {
+  my ($class, $tag, $region) = @_;
 
 =pod
 
@@ -172,7 +172,7 @@ Returns:
 
   my $self = bless { tag => $tag }, $class;
 
-  $self->updateViewInfo;
+  $self->updateViewInfo ($region);
 
   return $self;
 } # new
@@ -1168,12 +1168,7 @@ Returns:
 =cut
 
   return $self->{tag};
- } # tag
-
-# Alias name to tag
-sub name() {
-  goto &tag;
-} # name
+} # tag
 
 sub text_mode () {
   my ($self) = @_;
@@ -1368,7 +1363,7 @@ Returns:
 } # exists
 
 sub create (;$$$) {
-  my ($self, $host, $vws, $opts) = @_;
+  my ($self, $host, $vws, $region) = @_;
     
 =pod
 
@@ -1414,37 +1409,34 @@ Ouput from cleartool
 
 =cut
 
+  $region ||= $Clearcase::CC->region;
+
   if ($self->exists) {
-    $self->updateViewInfo;
+    $self->updateViewInfo ($region);
       
     return (0, ())
   } # if
 
   my ($status, @output);
     
-  $opts ||= '';
-
   if ($host && $vws) {
-    ($status, @output) = $Clearcase::CC->execute(
-      "mkview -tag $self->{tag} $opts " .
-      "-host $host -hpath $vws -gpath $vws $vws"
-    );
+    ($status, @output) = 
+      $Clearcase::CC->execute ("mkview -tag $self->{tag} -region $region "
+                          .    "-host $host -hpath $vws -gpath $vws $vws");
   } else {
     # Note this requires that -stgloc's work and that using -auto is not a 
     # problem.
-    ($status, @output) = $Clearcase::CC->execute(
-      "mkview -tag $self->{tag} $opts -stgloc -auto"
-    );
+    ($status, @output) =
+       $Clearcase::CC->execute ("mkview -tag $self->{tag} -stgloc -auto");
   } # if
 
-  $self->updateViewInfo;
+  $self->updateViewInfo ($region);
 
   return ($status, @output);
 } # create
   
-# TODO Is this used?
 sub createUCM ($$) {
-  my ($self, $stream, $pvob) = @_;
+  my ($self, $stream, $pvob, $region) = @_;
 
 =pod
 
@@ -1490,10 +1482,14 @@ Array of output
 
 =cut
 
-  return (0, ()) if $self->exists;
+  $region ||= $Clearcase::CC->region;
+  
+  return (0, ())
+    if $self->exists;
       
   # Update object members
-  $self->{pvob} = $pvob;
+  $self->{stream} = $stream;
+  $self->{pvob}   = $pvob;
     
   # Need to create the view
   my ($status, @output) = 
@@ -1503,7 +1499,7 @@ Array of output
   return ($status, @output)
     if $status;
       
-  $self->updateViewInfo;
+  $self->updateViewInfo ($region);
 
   return ($status, @output);
 } # createUCM
@@ -1549,13 +1545,12 @@ Ouput from cleartool
 
 =cut
 
-  return (0, ()) unless $self->exists;
+  return (0, ())
+    unless $self->exists;
       
   my ($status, @output);
 
   if ($self->dynamic) {
-    $self->stop;
-
     ($status, @output) = $Clearcase::CC->execute (
        "rmview -force -tag $self->{tag}"
      );
@@ -1749,11 +1744,13 @@ Ouput from cleartool
   return ($status, @output);
 } # set
 
-sub updateViewInfo () {
-  my ($self) = @_;
+sub updateViewInfo ($$) {
+  my ($self, $region) = @_;
+
+  $region ||= $Clearcase::CC->region;
 
   my ($status, @output) = $Clearcase::CC->execute (
-    "lsview -long -properties -full $self->{tag}"
+    "lsview -region $region -long -properties -full $self->{tag}"
   );
 
   # Assuming this view is an empty shell of an object that the user may possibly
@@ -1767,7 +1764,7 @@ sub updateViewInfo () {
   $self->{ucm}                = 0;
   $self->{additional_groups}  = '';
 
-  foreach (@output) {
+  for (@output) {
     if (/Global path: (.*)/) {
       $self->{gpath} = $1;
     } elsif (/Server host: (.*)/) {
@@ -1808,19 +1805,26 @@ sub updateViewInfo () {
       $self->{text_mode} = $1;
     } elsif (/Properties: (.*)/) {
       $self->{properties} = $1;
-    } elsif (/Owner: (\S+)\s+: (\S+) /) {
+    } elsif (/View owner: (\S+)$/) {
+      # It is possible that there may be problems enumerating
+      # -properties and -full when listing views due to servers
+      # no longer being available. Still the "View owner" line
+      # denotes the view's owner.
+      $self->{owner}      = $1;
+      $self->{owner_mode} = '';
+    } elsif (/Owner: (\S+)\s+: (\S+)/) {
       $self->{owner}          = $1;
       $self->{owner_mode}     = $2;
     } elsif (/Group: (.+)\s+:\s+(\S+)\s+/) {
       $self->{group}          = $1;
-       $self->{group_mode}     = $2;
-    } elsif (/Other:\s+: (\S+) /) {
+      $self->{group_mode}     = $2;
+    } elsif (/Other:\s+: (\S+)/) {
       $self->{other_mode}     = $1;
     } elsif (/Additional groups: (.*)/) {
       my @additional_groups = split /\s+/, $1;
       $self->{additional_groups} = \@additional_groups;
     } # if
-  } # foreach
+  } # for
 
   # Change modes to numeric
   $self->{mode} = 0;
@@ -1840,6 +1844,361 @@ sub updateViewInfo () {
   return;
 } # updateViewInfo
 
+sub viewPrivateStorage() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewPrivateStorage
+
+Returns the view private storage size for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view private storage
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewPrivateStorage});
+
+  return $self->{viewPrivateStorage};
+} # viewPrivateStorage
+
+sub viewPrivateStoragePct() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewPrivateStoragePct
+
+Returns the view private storage percent for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view private storage
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewPrivateStoragePct});
+
+  return $self->{viewPrivateStoragePct};
+} # viewPrivateStoragePct
+
+sub viewDatabase() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewDatabase
+
+Returns the view database size for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view database size
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewDatabase});
+
+  return $self->{viewDatabase};
+} # viewDatabase
+
+sub viewDatabasePct() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewDatabasePct
+
+Returns the view database percent for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view database percent
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewDatabasePct});
+
+  return $self->{viewDatabasePct};
+} # viewDatabasePct
+
+sub viewAdmin() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewAdmin
+
+Returns the view admin size for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view admin size
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewAdmin});
+
+  return $self->{viewAdmin};
+} # viewAdmin
+
+sub viewAdminPct() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewAdminPct
+
+Returns the view admin percent for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view admin percent
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewAdminPct});
+
+  return $self->{viewAdminPct};
+} # viewAdminPct
+
+sub viewSpace() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewSpace
+
+Returns the view total size for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view space
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewSpace});
+
+  return $self->{viewSpace};
+} # viewSpace
+
+sub viewSpacePct() {
+  my ($self) = @_;
+  
+=pod
+
+=head1 viewSpacePct
+
+Returns the view database percent for this view.
+
+Parameters:
+
+=for html <blockquote>
+
+=over
+
+=item none
+
+=back
+
+=for html </blockquote>
+
+Returns:
+
+=for html <blockquote>
+
+=over
+
+=item view space percent
+
+=back
+
+=for html </blockquote>
+
+=cut
+
+  $self->updateViewSpace unless ($self->{viewSpacePct});
+
+  return $self->{viewSpacePct};
+} # viewSpacePct
+
+sub updateViewSpace() {
+  my ($self) = @_;
+
+  my ($status, @output) = $Clearcase::CC->execute (
+    "space -region $self->{region} -view $self->{tag}"
+  );
+
+  $self->{viewPrivateStorage}    = 0.0;
+  $self->{viewPrivateStoragePct} = '0%';
+  $self->{viewAdmin}             = 0.0;
+  $self->{viewAdminPct}          = '0%';
+  $self->{viewDatabase}          = 0.0;
+  $self->{viewDatabasePct}       = '0%';
+  $self->{viewSpace}             = 0.0;
+  $self->{viewSpacePct}          = '0%';
+
+  for (@output) {
+    if (/\s*(\S+)\s*(\S+)\s*View private storage/) {
+      $self->{viewPrivateStorage}    = $1;
+      $self->{viewPrivateStoragePct} = $2;
+    } elsif (/\s*(\S+)\s*(\S+)\s*View database/) {
+      $self->{viewDatabase}    = $1;
+      $self->{viewDatabasePct} = $2;
+    } elsif (/\s*(\S+)\s*(\S+)\s*View administration/) {
+      $self->{viewAdmin}    = $1;
+      $self->{viewAdminPct} = $2;
+    } elsif (/\s*(\S+)\s*(\S+)\s*Subtotal/) {
+      $self->{viewSpace}    = $1;
+      $self->{viewSpacePct} = $2;
+    } # if
+  } # for
+
+  return;
+} # updateViewSpace
+
 1;
 
 =pod