Ignore:
Timestamp:
11/30/04 14:22:50 (19 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Overhaul of city listings - first stage. Cities are now listed in
ONE place for stuffing into HTML and so on. City list also updated
with most of the cities currently listed, and a few that have
probably been removed.
SQL schema updated with new table

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/cgi-bin/main.cgi

    r89 r91  
    6969# Other global variables
    7070my @masterblocks;
     71my @citylist;
     72my @poplist;
    7173my %allocated;  # Count for allocated blocks in a master block
    7274my %free;       # Count for free blocks (routed and unrouted) in a master block
    … …  
    7880# Use the connectDB function, otherwise we end up confusing ourselves
    7981my $ip_dbh = connectDB;
     82my $sth;
    8083
    8184# Slurp up the master block list - we need this several places
    8285# While we're at it, initialize the related hashes.
    83 my $sth = $ip_dbh->prepare("select * from masterblocks order by cidr");
     86$sth = $ip_dbh->prepare("select * from masterblocks order by cidr");
    8487$sth->execute;
    8588for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
    … …  
    9295}
    9396
     97# Initialize the city and poplist arrays
     98$sth = $ip_dbh->prepare("select * from cities order by city");
     99$sth->execute;
     100my $i = 0;
     101my $j = 0;
     102while (my @data = $sth->fetchrow_array) {
     103  $citylist[$i++] = $data[0];
     104  if ($data[1] eq 'y') {
     105    $poplist[$j++] = $data[0];
     106  }
     107}
    94108
    95109
    … …  
    779793        or croak "Could not open assign.html: $!";
    780794    $html = join('',<HTML>);
     795    close HTML;
    781796    my $masterlist = "<select name=allocfrom><option selected>-</option>\n";
    782797    foreach my $master (@masterblocks) {
    … …  
    785800    $masterlist .= "</select>\n";
    786801    $html =~ s|\$\$MASTERLIST\$\$|$masterlist|g;
    787     close HTML;
    788   }
     802    my $pops = '';
     803    foreach my $pop (@poplist) {
     804      $pops .= "<option>$pop</option>\n";
     805    }
     806    $html =~ s|\$\$POPLIST\$\$|$pops|g;
     807  }
     808  my $cities = '';
     809  foreach my $city (@citylist) {
     810    $cities .= "<option>$city</option>\n";
     811  }
     812  $html =~ s|\$\$ALLCITIES\$\$|$cities|g;
    789813
    790814  print $html;
Note: See TracChangeset for help on using the changeset viewer.