diff options
| author | ivan <ivan> | 2002-04-11 22:05:31 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2002-04-11 22:05:31 +0000 |
| commit | a7c1b602f88c177db34477ed4cdc1f72603f8995 (patch) | |
| tree | 116d090127ee48b041eeb9ff21a0d62c0c768250 /bin | |
| parent | 52a07a405e197fda1654fc61eefa538450f269e8 (diff) | |
(almost) everything for bug#375 - create export_svc table - part_svc to
part_export is now properly many-to-many, not one-to-many
still need to finish service editing (choosing exports) in
httemplate/edit/part_svc.cgi and httemplate/edti/process/part_svc.cgi
and do somethinga about that manual $svcdb = 'svc_acct' in
httemplate/edit/part_export.cgi (do part_export records need a svcdb?
probably not... should be able to just pass an svcdb on creation of new
exports, move the big %exports hash into part_export.pm and allow
httemplate/edit/part_svc.cgi to query it for exports that can apply to a given
svcdb....
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/fs-setup | 15 | ||||
| -rw-r--r-- | bin/sqlradius_reset | 8 |
2 files changed, 20 insertions, 3 deletions
diff --git a/bin/fs-setup b/bin/fs-setup index 2da0431bb..535408891 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: fs-setup,v 1.86 2002-04-10 08:39:47 ivan Exp $ +# $Id: fs-setup,v 1.87 2002-04-11 22:05:31 ivan Exp $ #to delay loading dbdef until we're ready BEGIN { $FS::Record::setup_hack = 1; } @@ -927,10 +927,21 @@ sub tables_hash_hack { 'index' => [ [ 'jobnum' ] ], }, + 'export_svc' => { + 'columns' => [ + 'exportsvcnum' => 'int', '', '', + 'exportnum' => 'int', '', '', + 'svcpart' => 'int', '', '', + ] + 'primary_key' => 'exportsvcnum', + 'unique' => [ [ 'exportnum', 'svcpart' ] ], + 'index' => [ [ 'exportnum' ], [ 'svcpart' ] ], + }, + 'part_export' => { 'columns' => [ 'exportnum', 'int', '', '', - 'svcpart', 'int', '', '', + #'svcpart', 'int', '', '', 'machine', 'varchar', '', $char_d, 'exporttype', 'varchar', '', $char_d, 'nodomain', 'char', 'NULL', 1, diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset index da98fe6be..454043f54 100644 --- a/bin/sqlradius_reset +++ b/bin/sqlradius_reset @@ -25,9 +25,15 @@ foreach my $export ( @exports ) { } foreach my $export ( @exports ) { + + #my @svcparts = map { $_->svcpart } $export->export_svc; + my @svc_acct = map { qsearchs('svc_acct', { 'svcnum' => $_->svcnum } ) } - qsearch('cust_svc', { 'svcpart' => $export->part_svc->svcpart } ); + map { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } + grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) } + $export->export_svc; + foreach my $svc_acct ( @svc_acct ) { #false laziness with FS::svc_acct::insert (like it matters) |