Changeset 13203 for trunk/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

May 3, 2007, 12:10:14 PM (19 years ago)

Author:

jhoblitt

Message:

valid that $key arguments are valid

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (18 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.33 2007-05-03 03:21:28 jhoblitt Exp $
+# $Id: Server.pm,v 1.34 2007-05-03 22:10:13 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -244 +244 @@
         {
             type        => SCALAR,
-        },
-        {
-            type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
+        },
+        # make sure the "newkey" doesn't already exist
+        {
+            type        => SCALAR,
+            callbacks   => {
+                'is not valid object key' => sub { not $self->_is_valid_object_key($_[0]) },
+            },
         },
     );
@@ -382 +389 @@
 }
 
-sub lock_object {
+sub lock_object
+{
     my $self = shift;
 
@@ -388 +396 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
         {
@@ -501 +512 @@
 }
 
-sub unlock_object {
+sub unlock_object
+{
     my $self = shift;
 
@@ -507 +519 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
         {
@@ -635 +650 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
         {
@@ -706 +724 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
         {
@@ -751 +772 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
     );
@@ -789 +813 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
         {
@@ -831 +858 @@
 
 
-sub find_objects {
+sub find_objects
+{
     my $self = shift;
 
@@ -870 +898 @@
 
 
-sub find_instances {
+sub find_instances
+{
     my $self = shift;
 
@@ -939 +968 @@
 }
 
-sub delete_instance {
+
+sub delete_instance
+{
     my $self = shift;
 
@@ -983 +1014 @@
             my $rows = $query->execute( $uri );
             
-            # if we affected something other then one row something very bad has happened
+            # if we affected something other then one row something very bad
+            # has happened
             unless ( $rows == 1 ) {
                 $log->logdie( "affected row count is $rows instead of 1" );
@@ -1016 +1048 @@
 }
 
-sub stat_object {
+
+sub stat_object
+{
     my $self = shift;
 
@@ -1123 +1157 @@
 }
 
-sub _is_valid_object_key  {
+
+sub _is_valid_object_key
+{
     my ($self, $key) = @_;
 
@@ -1149 +1185 @@
 }
 
-sub _is_valid_volume_name  {
+
+sub _is_valid_volume_name
+{
     my ($self, $vol_name) = @_;
 
@@ -1176 +1214 @@
 }
 
-sub DESTROY {
+
+sub DESTROY
+{
     my $self = shift;