IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 7, 2008, 3:59:25 PM (18 years ago)
Author:
bills
Message:

Allow the data store server to be installed without a full IPP installation.

Location:
trunk/DataStoreServer/scripts
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/DataStoreServer/scripts/dsfsindex

    r16954 r17381  
    88use warnings;
    99
     10use dsdbh;
    1011use DBI;
    1112
    12 use PS::IPP::Config qw($PS_EXIT_SUCCESS
    13                        $PS_EXIT_UNKNOWN_ERROR
    14                        $PS_EXIT_SYS_ERROR
    15                        $PS_EXIT_CONFIG_ERROR
    16                        $PS_EXIT_PROG_ERROR
    17                        $PS_EXIT_DATA_ERROR
    18                        $PS_EXIT_TIMEOUT_ERROR
    19                        metadataLookupStr
    20                        metadataLookupBool
    21                        caturi
    22                        );
     13my $PS_EXIT_CONFIG_ERROR = 3;
     14my $PS_EXIT_DATA_ERROR = 5;
    2315
    2416my $fileset = pop;
    … …  
    114106    print "$line\n";
    115107}
    116 
    117 sub getDBHandle {
    118     my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
    119     my $siteConfig = $ipprc->{_siteConfig};
    120 
    121     my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
    122     my $dbname   = metadataLookupStr($siteConfig, 'DBNAME');
    123     my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
    124     my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
    125     exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
    126 
    127     my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
    128 
    129     my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
    130     return $dbh;
    131 }

  • trunk/DataStoreServer/scripts/dsprodindex

    r16762 r17381  
    77
    88use DBI;
    9 use PS::IPP::Config qw($PS_EXIT_SUCCESS
    10                        $PS_EXIT_UNKNOWN_ERROR
    11                        $PS_EXIT_SYS_ERROR
    12                        $PS_EXIT_CONFIG_ERROR
    13                        $PS_EXIT_PROG_ERROR
    14                        $PS_EXIT_DATA_ERROR
    15                        $PS_EXIT_TIMEOUT_ERROR
    16                        metadataLookupStr
    17                        metadataLookupBool
    18                        caturi
    19                        );
     9use dsdbh;
    2010
     11my $PS_EXIT_CONFIG_ERROR = 3;
     12my $PS_EXIT_DATA_ERROR = 5;
    2113my $product = shift;
    2214die("must specify product to list") unless defined $product;
    … …  
    145137    print "$line\n";
    146138}
    147 
    148 # TODO: move this to a module
    149 sub getDBHandle {
    150     my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
    151     my $siteConfig = $ipprc->{_siteConfig};
    152 
    153     my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
    154     my $dbname   = metadataLookupStr($siteConfig, 'DBNAME');
    155     my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
    156     my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
    157     exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
    158 
    159     my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
    160 
    161     my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
    162     return $dbh;
    163 }

  • trunk/DataStoreServer/scripts/dsrootindex

    r16762 r17381  
    88use warnings;
    99
     10use dsdbh;
     11
    1012use DBI;
    1113
    12 use PS::IPP::Config qw($PS_EXIT_SUCCESS
    13                        $PS_EXIT_UNKNOWN_ERROR
    14                        $PS_EXIT_SYS_ERROR
    15                        $PS_EXIT_CONFIG_ERROR
    16                        $PS_EXIT_PROG_ERROR
    17                        $PS_EXIT_DATA_ERROR
    18                        $PS_EXIT_TIMEOUT_ERROR
    19                        metadataLookupStr
    20                        metadataLookupBool
    21                        caturi
    22                        );
     14my $PS_EXIT_CONFIG_ERROR = 3;
    2315
    2416my $dbh = getDBHandle();
    … …  
    4638    print $line;
    4739}
    48 
    49 # todo move to a module
    50 sub getDBHandle {
    51     my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
    52     my $siteConfig = $ipprc->{_siteConfig};
    53 
    54     my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
    55     my $dbname   = metadataLookupStr($siteConfig, 'DBNAME');
    56     my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
    57     my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
    58     exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;
    59 
    60     my $dsn = "DBI:mysql:host=$dbserver;database=$dbname";
    61 
    62     my $dbh = DBI->connect($dsn, $dbuser, $dbpass) or die "Cannot connect to server\n";
    63     return $dbh;
    64 }

  • trunk/DataStoreServer/scripts/tabledefs.sql

    r16872 r17381  
    7777
    7878# none of these types have any type specific columns
    79 INSERT INTO dsFileType (type) VALUES('psrequest');
    80 INSERT INTO dsFileType (type) VALUES('psresults');
    81 INSERT INTO dsFileType (type) VALUES('pstamp');
     79#INSERT INTO dsFileType (type) VALUES('psrequest');
     80#INSERT INTO dsFileType (type) VALUES('psresults');
     81#INSERT INTO dsFileType (type) VALUES('pstamp');
Note: See TracChangeset for help on using the changeset viewer.