Changeset 39672

Timestamp:

Sep 9, 2016, 11:38:38 AM (10 years ago)

Author:

watersc1

Message:

Typo fix, switch to proximity find.

Location:

branches/czw_branch/20160809/Nebulous-Server

Files:

• Build.PL (modified) (1 diff)
• bin/neb-aliasadd (modified) (2 diffs)
• bin/neb-cabadd (modified) (3 diffs)
• lib/Nebulous/Server.pm (modified) (2 diffs)

branches/czw_branch/20160809/Nebulous-Server/Build.PL

@@ -48 +48 @@
         bin/neb-voladd
         bin/neb-voladm
+        bin/neb-aliasadd
         bin/neb-insedit
         bin/neb-host

branches/czw_branch/20160809/Nebulous-Server/bin/neb-aliasadd

@@ -62 +62 @@
     my ($vol_id, $tmp_name);
     
-    my $vol_query = $db->prepare_cached( $sql->get_volume_by_name );
+    my $vol_query = $dbh->prepare( $sql->get_volume_by_name );
     $vol_query->execute( $target );
-    ($vol_id, $tmp_name, undef, undef) = vol_query->fetchrow_array;
+    ($vol_id, $tmp_name, undef, undef) = $vol_query->fetchrow_array;
     $vol_query->finish;
     
@@ -91 +91 @@
     my ($vol_id, $tmp_name);
     
-    my $vol_query = $db->prepare_cached( $sql->get_volume_by_name );
+    my $vol_query = $dbh->prepare( $sql->get_volume_by_name );
     $vol_query->execute( $target );
-    ($vol_id, $tmp_name, undef, undef) = vol_query->fetchrow_array;
+    ($vol_id, $tmp_name, undef, undef) = $vol_query->fetchrow_array;
     $vol_query->finish;
     

branches/czw_branch/20160809/Nebulous-Server/bin/neb-cabadd

@@ -19 +19 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbhost, $dbuser, $dbpass, $cname, $location, $site_id, $update);
+my ($db, $dbhost, $dbuser, $dbpass, $cname, $location, $site_id, $update, $cab_id);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -34 +34 @@
     'location|l=s'      => \$location,
     'site_id|s=s'       => \$site_id,
+    'cab_id=s'          => \$cab_id,
     'update|u'          => \$update,
 ) || pod2usage( 2 );
@@ -55 +56 @@
 
 if (defined($update)) {
-    unless ($cname && $location && $site_id) {
-        pod2usage( -msg => "Required options for update: --db --user --pass --cname --site_id --location", -exitval => 2 );
+    unless ($cname && $location && $site_id && $cab_id) {
+        pod2usage( -msg => "Required options for update: --db --user --pass --cname --site_id --location --cab_id", -exitval => 2 );
     }
     print "Updating cabinet...";

branches/czw_branch/20160809/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1753 +1753 @@
 }
 
-sub find_instances
+sub find_instances_old
 {
     my $self = shift;
@@ -1865 +1865 @@
 }
 
-sub find_instances_by_proximity
+#sub find_instances_by_proximity
+sub find_instances
 {
     my $self = shift;