Changeset 5662

Timestamp:

Dec 2, 2005, 4:26:59 PM (21 years ago)

Author:

jhoblitt

Message:

add Nebulous::Client->open_create()
change Nebulous::Client->create() to return just a filename

Location:

trunk

Files:

• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous-Server/t/11_client_create.t (modified) (5 diffs)
• Nebulous-Server/t/11_client_open_create.t (added)
• Nebulous/Changes (modified) (1 diff)
• Nebulous/lib/Nebulous/Client.pm (modified) (4 diffs)
• Nebulous/t/11_client_create.t (modified) (5 diffs)
• Nebulous/t/11_client_open_create.t (added)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.02
+    - add Nebulous::Client->open_create()
+    - change Nebulous::Client->create() to return just a filename
     - [nebclient] add nebOpenCreate()
     - [nebclient] change nebCreate() to return just a filename

trunk/Nebulous-Server/t/11_client_create.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 11_client_create.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 11_client_create.t,v 1.5 2005-12-03 02:26:59 jhoblitt Exp $
 
 use strict;
@@ -28 +28 @@
     );
 
-    my $fh = $neb->create( "foo" );
+    my $filename = $neb->create( "foo" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -41 +41 @@
     );
 
-    my $fh = $neb->create( "foo", 0 );
+    my $filename = $neb->create( "foo", 0 );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -54 +54 @@
     );
 
-    my $fh = $neb->create( "foo", 0, "node01" );
+    my $filename = $neb->create( "foo", 0, "node01" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -67 +67 @@
     );
 
-    my $fh = $neb->create( "foo", 0, "node01", "this is foo" );
+    my $filename = $neb->create( "foo", 0, "node01", "this is foo" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 

trunk/Nebulous/Changes

@@ -2 +2 @@
 
 0.02
+    - add Nebulous::Client->open_create()
+    - change Nebulous::Client->create() to return just a filename
     - [nebclient] add nebOpenCreate()
     - [nebclient] change nebCreate() to return just a filename

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.20 2005-08-31 03:33:24 jhoblitt Exp $
+# $Id: Client.pm,v 1.21 2005-12-03 02:26:59 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -127 +127 @@
     $log->debug( "server allocated $uri" );
 
+    my $filename;
+    eval {
+        $filename = _get_file_path( $uri );
+    };
+    $log->logdie( $@ ) if $@;
+
+    $log->debug( "local filename is $filename" );
+
+    $log->debug( "leaving" );
+
+    return $filename;
+}
+
+sub open_create {
+    my $self = shift;
+
+    my ( $key, @params ) = validate_pos( @_,
+        {
+            type        => SCALAR,
+        },
+        {
+            type        => SCALAR,
+            callbacks   => {
+                'is + integer' => sub { $_[0] =~ /^\d+$/ },
+            },
+            default     => 0,
+        },
+        {
+            type        => SCALAR,
+            optional    => 1,
+        },
+        {
+            type        => SCALAR,
+            optional    => 1,
+        },
+    );
+
+    $log->debug( "entered - @_" );
+
+    # how should already existing files be handled?
+
+    my $response = $self->{ 'server' }->create_object( $key, @params );
+    if ( $response->fault ) {
+        $log->error( $response->faultcode, " - ", $response->faultstring );
+        $log->debug( "leaving" );
+
+        return undef;
+    }
+
+    my $uri = $response->result;
+
+    $log->debug( "server allocated $uri" );
+
     my $fh;
     eval {
@@ -497 +550 @@
     );
 
-    $log->debug( "entered - @_" );
+#    $log->debug( "entered - @_" );
 
     my $fh      = $self->open( $key, 'read' );
@@ -507 +560 @@
     }
 
-    my $new_fh  = $self->create( $new_key );
+    my $new_fh  = $self->open_create( $new_key );
     unless ( $new_fh ) {
         $log->debug( "can not open object" );

trunk/Nebulous/t/11_client_create.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 11_client_create.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 11_client_create.t,v 1.5 2005-12-03 02:26:59 jhoblitt Exp $
 
 use strict;
@@ -28 +28 @@
     );
 
-    my $fh = $neb->create( "foo" );
+    my $filename = $neb->create( "foo" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -41 +41 @@
     );
 
-    my $fh = $neb->create( "foo", 0 );
+    my $filename = $neb->create( "foo", 0 );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -54 +54 @@
     );
 
-    my $fh = $neb->create( "foo", 0, "node01" );
+    my $filename = $neb->create( "foo", 0, "node01" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }
 
@@ -67 +67 @@
     );
 
-    my $fh = $neb->create( "foo", 0, "node01", "this is foo" );
+    my $filename = $neb->create( "foo", 0, "node01", "this is foo" );
 
-    is( ref $fh, 'GLOB', "good filehandle" );
+    ok( -e $filename, "good filename" );
 }